aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
Commit message (Expand)AuthorAgeFilesLines
* halt passed the -i flag to disable network interfaces (new halt option).r3-80Preston Brown1998-11-121-1/+2
* sort daemons in status() by pidBill Nottingham1998-11-021-1/+1
* fix status() (was catching instance of initscripts)Bill Nottingham1998-10-281-1/+1
* can't have spaces around = in shr3-78Erik Troan1998-10-151-1/+1
* fixed shell stuffErik Troan1998-10-151-1/+1
* raidstop -r doesn't work for 5.2 ;-)Erik Troan1998-10-151-5/+5
* added raidstop stuffErik Troan1998-10-151-0/+5
* raidstart doesn't exist! use raidadd/raidrunErik Troan1998-10-151-2/+7
* Accept all kernel numbers instead of just 2.0.xCristian Gafton1998-10-061-1/+1
* a few bugs fixed and a few unneeded processes removedMichael K. Johnson1998-09-211-5/+5
* Raid startup.Jeff Johnson1998-09-161-0/+26
* Don't run [KS]??foo.{rpmsave,rpmorig} scripts.Jeff Johnson1998-09-161-0/+8
* Remove Postgres sockets while booting (problem #816).Jeff Johnson1998-08-211-0/+3
* 1) only update /etc/issue if /etc/redhat-release is presentErik Troan1998-08-171-17/+15
* Remove annoying error messages.r3-69Jeff Johnson1998-08-162-3/+3
* Remove attempt to avoid running depmod on 2.1.x kernels.Jeff Johnson1998-08-141-1/+1
* Typo (Hao Li <hli@wag.caltech.edu>)Jeff Johnson1998-08-011-1/+1
* Permit /usr to be NFS mounted.r3-68Jeff Johnson1998-07-072-10/+10
* Perform rhkmvtag magic with module-info.r3-67Jeff Johnson1998-07-011-1/+2
* Remove debugging "echo ...".Jeff Johnson1998-07-011-2/+2
* Use rhkmvtag to attach modules directory to running kernel.Jeff Johnson1998-07-011-34/+7
* Turn off accounting before unmounting /var.Jeff Johnson1998-07-011-1/+2
* Correctly check fsck return code for non-root fs.Jeff Johnson1998-07-011-1/+3
* Fix bug track problems (#677, #731, #734, E-mail).Jeff Johnson1998-06-212-8/+28
* look for bootfile= to set /lib/modules/preferred symlinkErik Troan1998-06-071-9/+12
* 1) if preferred doesn't exist, run depmod -a normallyErik Troan1998-06-011-2/+2
* be more forcefull about creating preferred directoriesr3-64Erik Troan1998-05-101-1/+1
* moved stuff to /etc/profile.d/lang.shDonnie Barnes1998-05-061-16/+0
* added added sysconfig/i18n supportDonnie Barnes1998-05-061-0/+21
* update to linuxconf 1.11r8 capabilities.Michael K. Johnson1998-05-031-2/+38
* linuxconf supportr3-56Michael K. Johnson1998-05-021-5/+17
* probe function, more hintingMichael K. Johnson1998-05-021-5/+22
* added missing ;;r3-55Erik Troan1998-05-011-0/+1
* run depmod properlyErik Troan1998-05-011-3/+7
* use /lib/modules/preferred symlinkErik Troan1998-05-011-1/+2
* various cleanupsDonnie Barnes1998-04-301-1/+4
* rc.sysinit was removing /etc/nologin. Bad. Removed.Donnie Barnes1998-04-301-1/+1
* added sourcing of functionsDonnie Barnes1998-04-301-0/+3
* info for linuxconfMichael K. Johnson1998-04-241-0/+3
* handle kmod in 2.1 kernels nicelyMichael K. Johnson1998-04-211-2/+7
* works betterMichael K. Johnson1998-04-201-0/+1
* reasonable status, restart, reloadMichael K. Johnson1998-04-201-5/+11
* Added reload function.Michael K. Johnson1998-04-201-2/+16
* tpyoMichael K. Johnson1998-04-201-1/+1
* Made some sense of the "network status" command.Michael K. Johnson1998-04-201-3/+33
* sets up modules symlink properlyErik Troan1998-04-201-6/+5
* added more "" to get rid of some problemsErik Troan1998-04-201-3/+3
* only kill things that are currently upMichael K. Johnson1998-04-141-1/+1
* moved adding /etc/resolv.conf search path to normal reverse name lookupr3-52Erik Troan1998-04-051-8/+0
* fixed bugs in kernel-release handlingErik Troan1998-04-051-4/+4
generated by cgit v1.2.1 (git 2.21.0) at 2024-08-22 12:47:12 +0000
(rpmdrake-remove MandrakeUpdate));
+$usages{Xdrakres} = $usages{XFdrake};
+
+
+my ($i, @new_ARGV);
+foreach my $opt (@ARGV) {
$i++;
- $_ eq '--embedded' or next;
- (undef, $::XID, $::CCPID) = splice @ARGV, ($i-1), 3;
- $::isEmbedded = 1;
+ if ($opt eq '--help' || $opt eq '-h') {
+ version();
+ print STDERR N("\nUsage: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] ", $progname), if_($usages{$progname}, $usages{$progname}), "\n";
+# print N("\nUsage: "), $::usage, "\n" if $::usage;
+ exit(0);
+ } elsif ($opt eq '--version' || $opt eq '-v') {
+ version();
+ exit(0);
+ } elsif ($opt eq '--embedded') {
+ (undef, $::XID, $::CCPID) = splice @ARGV, ($i-1), 3;
+ $::isEmbedded = 1;
+ } elsif ($opt eq '--expert') {
+ $::expert = 1;
+ } elsif ($opt eq '--noauto') {
+ $::noauto = /-noauto/;
+ } elsif ($opt eq '--auto') {
+ $::auto = 1;
+ } elsif ($opt eq '--testing') {
+ $::testing = 1;
+ } elsif ($opt eq '--beginner') {
+ $::expert = 0;
+ } else {
+ push @new_ARGV, $opt;
+ }
+}
+
+@ARGV = @new_ARGV;
+
+
+sub version {
+ print STDERR "Drakxtools version 9.1.0
+Copyright (C) 1999-2002 MandrakeSoft by <install\@mandrakesoft.com>
+", $::license, "\n";
}
################################################################################
@@ -118,11 +189,11 @@ package standalone;
my $standalone_name;
sub explanations { c::syslog(c::LOG_INFO()|c::LOG_LOCAL1(), "@_") }
-@common_functs = qw(renamef linkf symlinkf output substInFile mkdir_p rm_rf cp_af touch setVarsInSh setExportedVarsInSh setExportedVarsInCsh update_gnomekderc);
-@builtin_functs = qw(chmod chown unlink link symlink rename system);
-@drakx_modules = qw(Xconfig::card Xconfig::default Xconfig::main Xconfig::monitor Xconfig::parse Xconfig::proprietary Xconfig::resolution_and_depth Xconfig::screen Xconfig::test Xconfig::various Xconfig::xfree Xconfig::xfree3 Xconfig::xfree4 Xconfig::xfreeX any bootloader bootlook c class_discard commands crypto detect_devices devices diskdrake diskdrake::hd_gtk diskdrake::interactive diskdrake::removable diskdrake::removable_gtk diskdrake::smbnfs_gtk fs fsedit http keyboard lang log loopback lvm modparm modules mouse my_gtk network network::adsl network::ethernet network::isdn_consts network::isdn network::modem network::netconnect network::network network::nfs network::smb network::tools partition_table partition_table_bsd partition_table::dos partition_table::empty partition_table::gpt partition_table::mac partition_table::raw partition_table::sun printer printerdrake proxy raid run_program scanner services steps swap timezone network::drakfirewall network::shorewall);
+our @common_functs = qw(renamef linkf symlinkf output substInFile mkdir_p rm_rf cp_af touch setVarsInSh setExportedVarsInSh setExportedVarsInCsh update_gnomekderc);
+our @builtin_functs = qw(chmod chown unlink link symlink rename system);
+our @drakx_modules = qw(Xconfig::card Xconfig::default Xconfig::main Xconfig::monitor Xconfig::parse Xconfig::proprietary Xconfig::resolution_and_depth Xconfig::screen Xconfig::test Xconfig::various Xconfig::xfree Xconfig::xfree3 Xconfig::xfree4 Xconfig::xfreeX any bootloader bootlook c class_discard commands crypto detect_devices devices diskdrake diskdrake::hd_gtk diskdrake::interactive diskdrake::removable diskdrake::removable_gtk diskdrake::smbnfs_gtk fs fsedit http keyboard lang log loopback lvm modparm modules mouse my_gtk network network::adsl network::ethernet network::isdn_consts network::isdn network::modem network::netconnect network::network network::nfs network::smb network::tools partition_table partition_table_bsd partition_table::dos partition_table::empty partition_table::gpt partition_table::mac partition_table::raw partition_table::sun printer printerdrake proxy raid run_program scanner services steps swap timezone network::drakfirewall network::shorewall);
-$SIG{SEGV} = sub { ($progname = $0) =~ s|.*/||; exec("drakbug --incident $progname") };
+$SIG{SEGV} = sub { my $progname = $0; $progname =~ s|.*/||; exec("drakbug --incident $progname") };
sub import {
($standalone_name = $0) =~ s|.*/||;
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 1c803ccd5..5c8311d3d 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -35,17 +35,6 @@ local $_ = join '', @ARGV;
my ($configure_this) = grep { !/^-/ } @ARGV;
$configure_this ||= 'everything';
-/-h/ || $configure_this !~ /^(resolution|monitor|everything|auto_install)/ and die <<'EOF';
-usage: XFdrake [--expert] [--noauto] [--auto] [everything]
- XFdrake [--noauto] monitor
- XFdrake resolution
-EOF
-
-my $auto = /-auto/;
-$::expert = /-expert/;
-$::noauto = /-noauto/;
-$::testing = /-testing/;
-
begin:
{
my $in = 'interactive'->vnew('su', 'X');
@@ -68,7 +57,7 @@ begin:
if ($has_conf) {
Xconfig::main::configure_chooser($in, $raw_X, $in->do_pkgs, $options);
} else {
- Xconfig::main::configure_everything($in, $raw_X, $in->do_pkgs, $auto, $options);
+ Xconfig::main::configure_everything($in, $raw_X, $in->do_pkgs, $::auto, $options);
}
} elsif ($configure_this eq 'auto_install') {
Xconfig::main::configure_everything_auto_install(Xconfig::default::configure(), $in->do_pkgs, {}, $options);
diff --git a/perl-install/standalone/adduserdrake b/perl-install/standalone/adduserdrake
index 98a2e3dd0..20268d9ff 100755
--- a/perl-install/standalone/adduserdrake
+++ b/perl-install/standalone/adduserdrake
@@ -8,13 +8,6 @@ use common;
use interactive;
use any;
-local $_ = join '', @ARGV;
-
-/-h/ and die "usage: adduserdrake [--beginner] [--expert] [<users...>]\n";
-
-$::beginner = /-beginner/;
-$::expert = /-expert/;
-
my @etc_pass_fields = qw(name pw uid gid realname home shell);
my @shells = grep { -x $_ } map { "/bin/$_" } qw(bash tcsh zsh ash ksh);
my $isMD5 = cat_("/etc/pam.d/system-auth") =~ /md5/;
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 1aa72a3df..a0b8cd158 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -36,18 +36,18 @@ use log;
use c;
-my %options;
-my @l = @ARGV;
-while (my $e = shift @l) {
- my ($option) = $e =~ /--?(.*)/ or next;
- if ($option =~ /(.*?)=(.*)/) {
- $options{$1} = $2;
- } else {
- $options{$option} = '';
- }
-}
-$::expert = defined(delete $options{expert});
-$::testing = defined(delete $options{testing});
+#my %options;
+#my @l = @ARGV;
+#while (my $e = shift @l) {
+" my ($option) = $e =~ /--?(.*)/ or next;
+# if ($option =~ /(.*?)=(.*)/) {
+# $options{$1} = $2;
+# } else {
+# $options{$option} = '';
+# }
+"}
+#$::expert = defined(delete $options{expert});
+#$::testing = defined(delete $options{testing});
my @types = qw(hd nfs smb dav removable fileshare);
my ($type, $para) = ('hd', '');
diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst
index 478850eeb..de6e2c8d0 100755
--- a/perl-install/standalone/drakautoinst
+++ b/perl-install/standalone/drakautoinst
@@ -29,8 +29,6 @@ use Data::Dumper;
local $_ = join '', @ARGV;
-/-h/ and die "usage: drakautoinst [--version]\n";
-/-version/ and die 'version: $Id$ '."\n";
$::direct = /-direct/;
$::direct = 1; #DEBUG
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 1aa1855e7..7054ed5db 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -13,13 +13,6 @@ use fsedit;
use fs;
use c;
-local $_ = join '', @ARGV;
-
-/-h/ and die "usage: drakboot [--expert] [--testing]\n";
-
-$::expert = /-expert/;
-$::testing = /-testing/;
-
my $in = 'interactive'->vnew('su', 'bootloader');
$::lilo_choice = \&lilo_choice;
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index a4930e616..5a9e897d8 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -36,11 +36,8 @@ use network::adsl;
use MDK::Common::Globals "network", qw($in $prefix $disconnect_file $connect_prog $connect_file $disconnect_file);
my $xpm_path = "/usr/share/libDrakX/pixmaps";
-$::isWizard = "@ARGV" =~ /--wizard/;
-$::expert = "@ARGV" =~ /--expert/;
local $_ = join '', @ARGV;
-
-#/-h/ and die "usage: drakconnect[--xf3] [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n";
+$::isWizard = /--wizard/;
my $netcnx = {};
my $netc = {};
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy
index a19e7889e..b173a9334 100755
--- a/perl-install/standalone/drakfloppy
+++ b/perl-install/standalone/drakfloppy
@@ -37,9 +37,6 @@ init Gtk;
Gtk->set_locale;
$in = 'interactive'->vnew('su', 'default');
-local $_ = join '', @ARGV;
-
-/-h/ and die N("usage: drakfloppy\n");
$expert_mode = 0;
# we have put here the list in order to do $list->clear() when we have to do
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index 357dfb2a2..488df9495 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -37,8 +37,6 @@ $::isInstall and die "Not supported during install.\n";
local $_ = join '', @ARGV;
-/-h/ and die "usage: drakgw [--version]\n";
-/-version/ and die 'version: $Id$ '."\n";
$::Wizard_pix_up = "wiz_drakgw.png";
$::Wizard_title = N("Internet Connection Sharing");
$::direct = /-direct/;
diff --git a/perl-install/standalone/draksound b/perl-install/standalone/draksound
index b8b5c519c..32acca45c 100755
--- a/perl-install/standalone/draksound
+++ b/perl-install/standalone/draksound
@@ -26,8 +26,6 @@ use common;
use harddrake::sound;
use modules;
-("@ARGV" =~ /--help|-h/) and die "usage: draksound [-h] [--help]\n";
-
my $in = 'interactive'->vnew();
modules::mergein_conf('/etc/modules.conf');
diff --git a/perl-install/standalone/drakxservices b/perl-install/standalone/drakxservices
index a57b430bb..92fd34fe0 100755
--- a/perl-install/standalone/drakxservices
+++ b/perl-install/standalone/drakxservices
@@ -9,11 +9,6 @@ use interactive;
use services;
use log;
-local $_ = join '', @ARGV;
-
-/-h/ and die "usage: drakxservices\n";
-
-
my $in = 'interactive'->vnew('su', 'services');
begin:
my $l = services::ask($in);
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index 859a066d5..c0d76ea3d 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -29,9 +29,6 @@ use lang;
use log;
use common;
-("@ARGV" =~ /--help|-h/) and die "usage: drakxtv [-h] [--help] [--no-guess]\n";
-
-
my $in = 'interactive'->vnew();
sub scan4channels {
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index fd4559853..7e594f17b 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -11,12 +11,6 @@ use common;
use any;
use c;
-local $_ = join '', @ARGV;
-
-/-h/ and die N("usage: keyboarddrake [--expert] [keyboard]\n");
-
-$::expert = /-expert/;
-
my $in;
my $keyboard = keyboard::read();
if (my ($kb) = grep { !/^-/ } @ARGV) {
diff --git a/perl-install/standalone/livedrake b/perl-install/standalone/livedrake
index be4f9894a..03868c03b 100755
--- a/perl-install/standalone/livedrake
+++ b/perl-install/standalone/livedrake
@@ -9,12 +9,6 @@ use interactive;
use run_program;
use c;
-local $_ = join '', @ARGV;
-
-/-h/ and die "usage: livedrake [--testing]\n";
-
-$::testing = /-testing/;
-
my $in = 'interactive'->vnew('su', 'default');
my $cd_mntpoint = "/mnt/cdrom";
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index bf493e774..4ac16adcb 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -11,13 +11,6 @@ use mouse;
use c;
-local $_ = join '', @ARGV;
-
-/-h/ and die "usage: mousedrake [--auto] [--testing]\n";
-
-$::auto = /-auto/;
-$::testing = /-testing/;
-
my $in = 'interactive'->vnew('su', 'mouse');
modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf';
diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index 0369cd661..4f05e1ec2 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -30,18 +30,7 @@ use c;
local $_ = join '', @ARGV;
-/-h/ and die "usage: printerdrake [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing] [--cups] [--lprng] [--lpd] [--pdq]\n";
-
-$::expert = 0;
-if (/-expert/) {
- $::expert = 1;
-} elsif (/-beginner/) {
- $::expert = 0;
-} else {
- printer::main::get_usermode ();
-}
-$::noauto = /-noauto/;
-$::testing = /-testing/;
+printer::main::get_usermode ();
my $printer;
generated by cgit v1.2.1 (git 2.21.0) at 2024-08-22 12:47:12 +0000