summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-08-07 18:19:33 +0000
committerOlivier Blin <oblin@mandriva.com>2009-08-07 18:19:33 +0000
commit251b3d2788e0a84a08de7cf6a9e1fc57719136bf (patch)
treeca09420beae82b755fa8c26e5892bf849ae502e8
parent1fcdcfd86d44224d4937c93b17f08460fa83d807 (diff)
downloaddrakiso-251b3d2788e0a84a08de7cf6a9e1fc57719136bf.tar
drakiso-251b3d2788e0a84a08de7cf6a9e1fc57719136bf.tar.gz
drakiso-251b3d2788e0a84a08de7cf6a9e1fc57719136bf.tar.bz2
drakiso-251b3d2788e0a84a08de7cf6a9e1fc57719136bf.tar.xz
drakiso-251b3d2788e0a84a08de7cf6a9e1fc57719136bf.zip
allow to skip writing fstab
-rwxr-xr-xdraklive5
1 files changed, 3 insertions, 2 deletions
diff --git a/draklive b/draklive
index 184ea51..6eb8143 100755
--- a/draklive
+++ b/draklive
@@ -275,7 +275,8 @@ sub post_install_system {
#- remove some build-machine specific configuration
substInFile { undef $_ if /^[^#]/ } $live->get_system_root . $_
- foreach qw(/etc/fstab /etc/mtab /etc/modprobe.conf /etc/modprobe.preload /etc/iftab /etc/shorewall/interfaces /etc/mdadm.conf /etc/resolv.conf);
+ foreach qw(/etc/mtab /etc/modprobe.conf /etc/modprobe.preload /etc/iftab /etc/shorewall/interfaces /etc/mdadm.conf /etc/resolv.conf),
+ if_(!$live->{system}{skip_fstab}, '/etc/fstab');
unlink($_) foreach map { glob($live->get_system_root . $_) } @{$live->{system}{remove_files} || []};
if ($live->{system}{modules_conf}) {
@@ -290,7 +291,7 @@ sub post_install_system {
$live->{mount}{overlay}
? "none / $live->{mount}{overlay} rw 0 0\n"
: $live->{media}->get_media_setting('source') . " / " . $live->{media}->get_media_setting('fs') . " defaults 1 1\n"
- );
+ ) unless $live->{system}{skip_fstab};
#- interactive mode can lead to race in initscripts
#- (don't use addVarsInSh from MDK::Common, it breaks shell escapes)