make directory path prefixed by / (to make subpath usage easier)

1 files changed, 11 insertions, 11 deletions

diff --git a/draklive b/draklive
index 225f4c7..63c1b9d 100755
--- a/draklive
+++ b/draklive
@@ -36,7 +36,7 @@ use File::Temp;
 my $dir_distrib_sqfs = {
     mountpoint => '/distrib',
     type => 'squashfs',
-    path => 'distrib.sqfs',
+    path => '/distrib.sqfs',
     # perl -MMDK::Common -e 'print map_index { (32767 - $::i) . " $_" } grep { !m,^/(?:dev|proc|sys|live/distrib), } uniq(<>)' < bootlog.list > config/distrib.sort
     sort => "config/distrib.sort",
     build_from => '/',
@@ -76,7 +76,7 @@ my %predefined = (
                 {
                     mountpoint => '/system',
                     type => 'squashfs',
-                    path => 'system.sqfs'
+                    path => '/system.sqfs'
                 },
                 $dir_memory,
             ],
@@ -112,7 +112,7 @@ my %custom = (
                         pre_allocate => $default_size,
                         if_(defined $o_min_size, min_size => $o_min_size),
                         fs => 'ext2',
-                        path => 'system.loop'
+                        path => '/system.loop'
                     },
                     {
                         mountpoint => '/system',
@@ -186,7 +186,7 @@ my %loop = (
         extension => '.sqfs',
         build => sub {
             my ($live, $dir) = @_;
-            my $dest = get_builddir($live) . $live->{prefix}{build}{loopbacks} . '/' . $dir->{path};
+            my $dest = get_builddir($live) . $live->{prefix}{build}{loopbacks} . $dir->{path};
             mkdir_p(dirname($dest));
             my $root = $dir->{root} || get_system_root($live);
             my $src = $root . $dir->{build_from};
@@ -213,7 +213,7 @@ my %loop = (
             my ($live, $dir) = @_;
             $dir->{loop} = "/dev/loop" . $loop_number++;
             (
-                "/bin/losetup $dir->{loop} $live->{prefix}{live}{mnt}$live->{prefix}{media}{mnt}$live->{prefix}{media}{loopbacks}/$dir->{path}",
+                "/bin/losetup $dir->{loop} $live->{prefix}{live}{mnt}$live->{prefix}{media}{mnt}$live->{prefix}{media}{loopbacks}$dir->{path}",
                 "mount -o ro -t squashfs $dir->{loop} $live->{prefix}{live}{mnt}$dir->{mountpoint}",
             );
         },
@@ -223,7 +223,7 @@ my %loop = (
         extension => '.loop',
         build => sub {
             my ($live, $dir) = @_;
-            my $dest = get_builddir($live) . $live->{prefix}{build}{loopbacks} . '/' . $dir->{path};
+            my $dest = get_builddir($live) . $live->{prefix}{build}{loopbacks} . $dir->{path};
             mkdir_p(dirname($dest));
             device_allocate_fs($dest, $dir->{pre_allocate});
             device_mkfs($dest, $dir->{fs}) if !defined $dir->{min_size};
@@ -233,7 +233,7 @@ my %loop = (
             $dir->{loop} = "/dev/loop" . $loop_number++;
             my $fsck = "chroot </dev/tty1 $live->{prefix}{live}{mnt}$dir_distrib_sqfs->{mountpoint} /sbin/fsck $dir->{loop}";
             (
-                "losetup $dir->{loop} $live->{prefix}{live}{mnt}$live->{prefix}{media}{mnt}$live->{prefix}{media}{loopbacks}/$dir->{path}",
+                "losetup $dir->{loop} $live->{prefix}{live}{mnt}$live->{prefix}{media}{mnt}$live->{prefix}{media}{loopbacks}$dir->{path}",
                 qq(sh -c "$fsck -a || $fsck -y"),
                 "mount -t $dir->{fs} $dir->{loop} $live->{prefix}{live}{mnt}$dir->{mountpoint}",
             );
@@ -620,7 +620,7 @@ sub configure_draklive_resize {
     if ($resizable_loopback) {
         output(get_system_root($live) . '/etc/sysconfig/draklive-resize', <<EOF);
 DRAKLIVE_RESIZE=yes
-LOOPBACK=$live->{prefix}{live}{mnt}$live->{prefix}{media}{mnt}$live->{prefix}{media}{loopbacks}/$resizable_loopback->{path}
+LOOPBACK=$live->{prefix}{live}{mnt}$live->{prefix}{media}{mnt}$live->{prefix}{media}{loopbacks}$resizable_loopback->{path}
 TYPE=$resizable_loopback->{fs}
 MIN_SIZE=$resizable_loopback->{min_size}
 MOUNT=$live->{prefix}{live}{mnt}$resizable_loopback->{mountpoint}_resized
@@ -965,9 +965,9 @@ sub create_cdrom_master {
          $live->{prefix}{media}{boot} . '=' . get_builddir($live) . $live->{prefix}{build}{boot},
          if_(!$opts->{boot_only},
              map {
-                 $live->{prefix}{media}{loopbacks} . '/' . $_ .
+                 $live->{prefix}{media}{loopbacks} . $_ .
                  '=' .
-                 get_builddir($live) . $live->{prefix}{build}{loopbacks} . '/' . $_;
+                 get_builddir($live) . $live->{prefix}{build}{loopbacks} . $_;
              } list_selected_loopbacks($live),
          ),
          if_($live->{media}{files},
@@ -1114,7 +1114,7 @@ sub record_usb_master {
         my $all_files = 0;
         my $current_file = 0;
         my $list_file = tmpnam();
-        output_p($list_file, map { "$_\n" } list_selected_loopbacks($live));
+        output_p($list_file, map { ".$_\n" } list_selected_loopbacks($live));
         local $/ = "\r";
         run_foreach($live->{update_progress} ? sub {
                         if (/^\s*(\d+)\s+\d+%\s+/) {