Commit bbd7665c authored by Russ Fish's avatar Russ Fish

Make things consistent. If Daikon is happy, so are we.

parent 9c254ace
...@@ -12,8 +12,8 @@ package liblocsetup; ...@@ -12,8 +12,8 @@ package liblocsetup;
use Exporter; use Exporter;
@ISA = "Exporter"; @ISA = "Exporter";
@EXPORT = @EXPORT =
qw ( $CP $LN $RM $CHOWN $CHMOD $TOUCH $MOUNT $UMOUNT $EGREP qw ( $RM $CHOWN $MOUNT $UMOUNT ## $CP $LN $CHMOD $TOUCH $EGREP
$NTS $NET $HOSTSFILE $NTS $NET ## $HOSTSFILE
$TMPASSWD $SFSSD $SFSCD $RPMCMD $TMPASSWD $SFSSD $SFSCD $RPMCMD
os_account_cleanup os_accounts_start os_accounts_end os_accounts_sync os_account_cleanup os_accounts_start os_accounts_end os_accounts_sync
os_ifconfig_line os_etchosts_line os_ifconfig_line os_etchosts_line
...@@ -50,15 +50,15 @@ use librc; ...@@ -50,15 +50,15 @@ use librc;
# #
# Various programs and things specific to CygWin on XP and that we want to export. # Various programs and things specific to CygWin on XP and that we want to export.
# #
$CP = "/bin/cp"; ##$CP = "/bin/cp";
$LN = "/bin/ln"; ##$LN = "/bin/ln";
$RM = "/bin/rm"; $RM = "/bin/rm";
$CHOWN = "/bin/chown"; $CHOWN = "/bin/chown";
$CHMOD = "/bin/chmod"; ##$CHMOD = "/bin/chmod";
$TOUCH = "/bin/touch"; ##$TOUCH = "/bin/touch";
$MOUNT = "/bin/mount"; $MOUNT = "/bin/mount";
$UMOUNT = "/bin/umount"; $UMOUNT = "/bin/umount";
$EGREP = "/bin/egrep -q"; ##$EGREP = "/bin/egrep -q";
# Cygwin. # Cygwin.
$MKPASSWD = "/bin/mkpasswd"; $MKPASSWD = "/bin/mkpasswd";
...@@ -71,7 +71,7 @@ $NTS = "/cygdrive/c/WINDOWS/system32"; ...@@ -71,7 +71,7 @@ $NTS = "/cygdrive/c/WINDOWS/system32";
$NET = "$NTS/net"; $NET = "$NTS/net";
$NETSH = "$NTS/netsh"; $NETSH = "$NTS/netsh";
$NTE = "$NTS/drivers/etc"; $NTE = "$NTS/drivers/etc";
$HOSTSFILE = "$NTE/hosts"; ##$HOSTSFILE = "$NTE/hosts";
# #
# These are not exported # These are not exported
...@@ -347,16 +347,16 @@ sub os_usermod($$$$$$) ...@@ -347,16 +347,16 @@ sub os_usermod($$$$$$)
# Unimplemented. # Unimplemented.
return -1; return -1;
if ($root) { ##if ($root) {
$glist = join(',', split(/,/, $glist), "root"); ## $glist = join(',', split(/,/, $glist), "root");
} ##}
if ($glist ne "") { ##if ($glist ne "") {
$glist = "-G $glist"; ## $glist = "-G $glist";
} ##}
# Map the shell into a full path. ### Map the shell into a full path.
$shell = MapShell($shell); ##$shell = MapShell($shell);
##
return system("$USERMOD -s $shell -g $gid $glist -p '$pswd' $login"); ##return system("$USERMOD -s $shell -g $gid $glist -p '$pswd' $login");
} }
# #
......
...@@ -43,8 +43,8 @@ BEGIN ...@@ -43,8 +43,8 @@ BEGIN
# #
# Various programs and things specific to win32/cygwin and that we want to export. # Various programs and things specific to win32/cygwin and that we want to export.
# #
$CP = "/bin/cp"; ##$CP = "/bin/cp";
$EGREP = "/bin/egrep -q"; ##$EGREP = "/bin/egrep -q";
#$MOUNT = "/bin/mount"; #$MOUNT = "/bin/mount";
#$UMOUNT = "/bin/umount"; #$UMOUNT = "/bin/umount";
#$TMPASSWD = "$ETCDIR/passwd"; #$TMPASSWD = "$ETCDIR/passwd";
...@@ -67,12 +67,12 @@ $EGREP = "/bin/egrep -q"; ...@@ -67,12 +67,12 @@ $EGREP = "/bin/egrep -q";
#my $IFC_10MBS = "10baseT"; #my $IFC_10MBS = "10baseT";
#my $IFC_FDUPLEX = "FD"; #my $IFC_FDUPLEX = "FD";
#my $IFC_HDUPLEX = "HD"; #my $IFC_HDUPLEX = "HD";
#my $RPMINSTALL = "/bin/rpm -i %s"; my $RPMINSTALL = "/bin/rpm -i %s";
#my @LOCKFILES = ("/etc/group.lock", "/etc/gshadow.lock"); #my @LOCKFILES = ("/etc/group.lock", "/etc/gshadow.lock");
my $MKDIR = "/bin/mkdir"; my $MKDIR = "/bin/mkdir";
#my $GATED = "/usr/sbin/gated"; my $GATED = "/usr/sbin/gated";
#my $ROUTE = "/sbin/route"; #my $ROUTE = "/sbin/route";
#my $SHELLS = "/etc/shells"; my $SHELLS = "/etc/shells";
#my $DEFSHELL = "/bin/tcsh"; #my $DEFSHELL = "/bin/tcsh";
# #
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment