summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2006-02-24 18:22:22 +0000
committerOlivier Blin <oblin@mandriva.org>2006-02-24 18:22:22 +0000
commit6aedf724114e18c1f68e50cab295475145faf837 (patch)
tree6899a31a0ba81b8d005e0207da6c6a30d3934d52
parentc692427ebf339599477885dd65044a2863e737e6 (diff)
downloaddrakx-6aedf724114e18c1f68e50cab295475145faf837.tar
drakx-6aedf724114e18c1f68e50cab295475145faf837.tar.gz
drakx-6aedf724114e18c1f68e50cab295475145faf837.tar.bz2
drakx-6aedf724114e18c1f68e50cab295475145faf837.tar.xz
drakx-6aedf724114e18c1f68e50cab295475145faf837.zip
remove /etc/modprobe.conf and /etc/modprobe.preload build-machine specific stuff
-rwxr-xr-xtools/draklive5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/draklive b/tools/draklive
index 3fa422907..95f25fc05 100755
--- a/tools/draklive
+++ b/tools/draklive
@@ -484,8 +484,9 @@ sub post_install_system {
#- (don't use addVarsInSh from MDK::Common, it breaks shell escapes)
substInFile { s/^PROMPT=.*/PROMPT=no/ } get_system_root($live) . '/etc/sysconfig/init';
- #- make sure mtab and fstab don't contain build-machine specific configuration
- output(get_system_root($live) . $_, '') foreach qw(/etc/fstab /etc/mtab);
+ #- remove some build-machine specific configuration
+ output(get_system_root($live) . $_, '') foreach qw(/etc/fstab /etc/mtab /etc/modprobe.conf);
+ substInFile { undef $_ if /^[^#]/ } get_system_root($live) . '/etc/modprobe.preload';
#- disable first boot wizard
output(get_system_root($live) . '/etc/sysconfig/firstboot', 'FIRSTBOOT=no');