summaryrefslogtreecommitdiffstats
path: root/globetrotter
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-04-25 12:26:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-04-25 12:26:16 +0000
commit126777bc019a54afb4ec51299f2cf9d2841698aa (patch)
tree97f76e571902ead55ba138f1156a4b4f00b9b779 /globetrotter
parentf1f67448efc714873378dfeb8279fae68054a90a (diff)
downloaddrakx-backup-do-not-use-126777bc019a54afb4ec51299f2cf9d2841698aa.tar
drakx-backup-do-not-use-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.gz
drakx-backup-do-not-use-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.bz2
drakx-backup-do-not-use-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.xz
drakx-backup-do-not-use-126777bc019a54afb4ec51299f2cf9d2841698aa.zip
re-sync after the big svn loss
Diffstat (limited to 'globetrotter')
-rwxr-xr-xglobetrotter/make_live4
1 files changed, 2 insertions, 2 deletions
diff --git a/globetrotter/make_live b/globetrotter/make_live
index 7b13ccd39..bbdb46a3b 100755
--- a/globetrotter/make_live
+++ b/globetrotter/make_live
@@ -226,7 +226,7 @@ sub installPackages() {
qw(openssh-server), #- fred wants it
qw(alsa-utils cdialog newt),
qw(k3b-dvd),
- qw(davfs nfs-utils samba-server sane-backends xsane xsane-gimp ntp),
+ qw(davfs2 nfs-utils samba-server sane-backends xsane xsane-gimp ntp),
qw(acpi acpid), #- so that removing acpi=ht will work
qw(mountloop), #- crypted folders
#- doc:
@@ -478,7 +478,7 @@ if ($options{post}) {
# do not save the whole /etc/sysconfig;
push @files, (map { "/etc/X11/$_" } qw(XF86Config XF86Config-4 xorg.conf)),
(map { "/etc/sysconfig/$_" } qw(keyboard harddrake2/previous_hw harddisks)),
- (map { "/etc/$_" } qw(modprobe.conf modprobe.devfs modprobe.preload modules modules.conf modules.devfs)),
+ (map { "/etc/$_" } qw(modprobe.conf modprobe.preload modules modules.conf)),
qw(/etc/asound.state /etc/fstab /etc/ld.so.conf/GL.conf /etc/shorewall/);
output($prof_cfg, join("\n", sort @files));