diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-10-30 18:45:54 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-10-30 18:45:54 +0000 |
| commit | 6c255528ca7ddec4b7902a39f43f90f4a720f0a8 (patch) | |
| tree | 267e3e058f07bd9e67c88f950fa643dfff6a2ee9 | |
| parent | ce6bc6d571a5fa7418301ecebf4fc0003337117e (diff) | |
| download | draklive-6c255528ca7ddec4b7902a39f43f90f4a720f0a8.tar draklive-6c255528ca7ddec4b7902a39f43f90f4a720f0a8.tar.gz draklive-6c255528ca7ddec4b7902a39f43f90f4a720f0a8.tar.bz2 draklive-6c255528ca7ddec4b7902a39f43f90f4a720f0a8.tar.xz draklive-6c255528ca7ddec4b7902a39f43f90f4a720f0a8.zip | |
do not pre-create mountpoints for plain mounts in initrd, they are created at runtime
| -rw-r--r-- | lib/MDV/Draklive/Initrd.pm | 2 | ||||
| -rw-r--r-- | lib/MDV/Draklive/Loopback.pm | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/MDV/Draklive/Initrd.pm b/lib/MDV/Draklive/Initrd.pm index bceaa09..8b49f32 100644 --- a/lib/MDV/Draklive/Initrd.pm +++ b/lib/MDV/Draklive/Initrd.pm @@ -70,7 +70,7 @@ sub create_media_specific_initrd { map { $live->{prefix}{live}{mnt} . $_ } $live->{prefix}{media}{mnt}, $live->{mount}{root}, - map { $_->{mountpoint} } @{$live->{mount}{dirs} || []}; + map { $_->{mountpoint} } grep { !$loop_types{$_->{type}}{skip_mkdir} } @{$live->{mount}{dirs} || []}; #- use nash with label support inst_initrd_bin($root, $initrd_tree, '/sbin/nash'); diff --git a/lib/MDV/Draklive/Loopback.pm b/lib/MDV/Draklive/Loopback.pm index 768b708..c9dbd9c 100644 --- a/lib/MDV/Draklive/Loopback.pm +++ b/lib/MDV/Draklive/Loopback.pm @@ -86,6 +86,7 @@ our %loop_types; }, }, plain => { + skip_mkdir => 1, mount => sub { my ($live, $dir) = @_; qq(sh -c "mkdir -p $live->{prefix}{live}{mnt}$dir->{mountpoint}"); |