diff options
| -rwxr-xr-x | move/make_live | 6 | ||||
| -rw-r--r-- | move/move.pm | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/move/make_live b/move/make_live index 49437af91..3761ba30f 100755 --- a/move/make_live +++ b/move/make_live @@ -6,7 +6,7 @@ use pkgs; my @langs = map { /^../; $& } split /\s/, (cat_('move.pm') =~ /ALLOWED_LANGS = qw\((.*)\)/)[0]; -@ARGV == 0 or die "usage: make_live\n"; +@ARGV <= 1 or die "usage: make_live [live_location=/tmp/live_tree]\n"; sub installPackages { rename "/etc/rpm/macros", "/etc/rpm/macros."; @@ -33,6 +33,7 @@ sub installPackages { qw(XFree86-server XFree86-xfs XFree86-FBDev), qw(acpi acpid), #- so that removing acpi=ht will work qw(mountloop), #- crypted folders + qw(zcip dhcpcd ppp kdenetwork-kppp rp-pppoe pptp-adsl speedtouch speedtouch_mgmt nfs-utils-clients samba-client tmdns wireless-tools adiusbadsl), #- network conf ], }); @@ -54,7 +55,8 @@ sub installPackages { } my $cwd = chomp_(`pwd`); -$::prefix = "/tmp/live_tree"; +$::prefix = $ARGV[0] || '/tmp/live_tree'; +print "Making live in $::prefix directory.\n"; { eval { fs::umount("$::prefix/proc") }; diff --git a/move/move.pm b/move/move.pm index 9a1abdf8a..6fb773dfc 100644 --- a/move/move.pm +++ b/move/move.pm @@ -30,7 +30,7 @@ sub init { #- rw things mkdir "/$_" foreach qw(home mnt root root/tmp etc var); - mkdir "/etc/$_" foreach qw(X11 cups); + mkdir "/etc/$_" foreach qw(X11); touch '/etc/modules.conf'; symlinkf "/proc/mounts", "/etc/mtab"; @@ -38,12 +38,12 @@ sub init { #- sudoers must a file, not a symlink system("cp /image/etc/{passwd,group,sudoers} /etc"); - system("cp -R /image/etc/cups/* /etc/cups"); + mkdir_p("/etc/$_"), system("cp -R /image/etc/$_/* /etc/$_") foreach qw(cups profile.d sysconfig/network-scripts); #- ro things symlinkf_short("/image/etc/$_", "/etc/$_") foreach qw(alternatives shadow man.config services shells pam.d security inputrc ld.so.conf - DIR_COLORS bashrc profile profile.d rc.d init.d devfsd.conf gtk-2.0 pango fonts modules.devfs + DIR_COLORS bashrc profile rc.d init.d devfsd.conf gtk-2.0 pango fonts modules.devfs dynamic gnome-vfs-2.0 gnome-vfs-mime-magic gtk gconf menu menu-methods nsswitch.conf default login.defs skel ld.so.cache openoffice xinetd.d); symlinkf_short("/image/etc/X11/$_", "/etc/X11/$_") @@ -102,6 +102,7 @@ sub install2::startMove { #- automatic printer, timezone, network configs require install_steps_interactive; + install_steps_interactive::configureNetwork($o); install_steps_interactive::summaryBefore($o); require install_any; |