summaryrefslogtreecommitdiffstats
path: root/move/make_live
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-11-05 16:52:22 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-11-05 16:52:22 +0000
commitf9a813517e4c2d76e5b4e1731f1d9e029a5c784d (patch)
treeed76be079c3ef52e910de8389ccd2291bcffe610 /move/make_live
parent68d279807f814790a8a711b0e39e340f663acc0d (diff)
downloaddrakx-f9a813517e4c2d76e5b4e1731f1d9e029a5c784d.tar
drakx-f9a813517e4c2d76e5b4e1731f1d9e029a5c784d.tar.gz
drakx-f9a813517e4c2d76e5b4e1731f1d9e029a5c784d.tar.bz2
drakx-f9a813517e4c2d76e5b4e1731f1d9e029a5c784d.tar.xz
drakx-f9a813517e4c2d76e5b4e1731f1d9e029a5c784d.zip
auto configure network
Diffstat (limited to 'move/make_live')
-rwxr-xr-xmove/make_live6
1 files changed, 4 insertions, 2 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") };