summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2006-02-27 12:21:39 +0000
committerOlivier Blin <oblin@mandriva.org>2006-02-27 12:21:39 +0000
commit2789c08ed93f6f9849b4d5c10d21074b1401f3da (patch)
treecac19f3d8bf5ac4366b298cd670e0c894185603d
parent3ba744f8b332605047516c9bdb772187df44fbda (diff)
downloaddrakx-2789c08ed93f6f9849b4d5c10d21074b1401f3da.tar
drakx-2789c08ed93f6f9849b4d5c10d21074b1401f3da.tar.gz
drakx-2789c08ed93f6f9849b4d5c10d21074b1401f3da.tar.bz2
drakx-2789c08ed93f6f9849b4d5c10d21074b1401f3da.tar.xz
drakx-2789c08ed93f6f9849b4d5c10d21074b1401f3da.zip
run harddrake because a crappy snd-usb-audio workaround may do something at shutdown (#21329)
-rwxr-xr-xtools/draklive12
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/draklive b/tools/draklive
index 95f25fc05..948778edd 100755
--- a/tools/draklive
+++ b/tools/draklive
@@ -480,14 +480,18 @@ sub post_install_system {
run_({ root => get_system_root($live) },
'perl', '-MStorable', '-e', qq(Storable::store({ UNKNOWN => {} }, '/etc/sysconfig/harddrake2/previous_hw')));
- #- interactive mode can lead to race in initscripts
- #- (don't use addVarsInSh from MDK::Common, it breaks shell escapes)
- substInFile { s/^PROMPT=.*/PROMPT=no/ } get_system_root($live) . '/etc/sysconfig/init';
-
#- 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';
+ #- run harddrake because a crappy snd-usb-audio workaround may do something at shutdown
+ #- (do it after the modprobe files are cleaned)
+ run_({ root => get_system_root($live) }, '/usr/share/harddrake/service_harddrake', 'stop');
+
+ #- interactive mode can lead to race in initscripts
+ #- (don't use addVarsInSh from MDK::Common, it breaks shell escapes)
+ substInFile { s/^PROMPT=.*/PROMPT=no/ } get_system_root($live) . '/etc/sysconfig/init';
+
#- disable first boot wizard
output(get_system_root($live) . '/etc/sysconfig/firstboot', 'FIRSTBOOT=no');
#- enable drakx-finish-install