ppcrcd/trunk/conf.dir: etc/inittab etc/rc.d/init.d/gpm etc/rc.d/rc.sysinit etc/sysconfig/clock lib/u...
sparky
cvs at pld-linux.org
Thu Mar 16 00:43:22 CET 2006
Author: sparky
Date: Thu Mar 16 00:43:14 2006
New Revision: 7179
Modified:
ppcrcd/trunk/conf.dir/etc/inittab
ppcrcd/trunk/conf.dir/etc/rc.d/init.d/gpm
ppcrcd/trunk/conf.dir/etc/rc.d/rc.sysinit
ppcrcd/trunk/conf.dir/etc/sysconfig/clock
ppcrcd/trunk/conf.dir/lib/udev/udev_net_helper
ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/add-ppcrcd-to-nvram.sh
ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/find_md
ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/load-conf
ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/net-detect
ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/nvram-add-ppcrcd.pl
ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/rc.live
ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/setbootopt
ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/xmltar.pl
ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/xmluntar.pl
Log:
- killed trailing white spaces
Modified: ppcrcd/trunk/conf.dir/etc/inittab
==============================================================================
--- ppcrcd/trunk/conf.dir/etc/inittab (original)
+++ ppcrcd/trunk/conf.dir/etc/inittab Thu Mar 16 00:43:14 2006
@@ -6,7 +6,7 @@
# 4 - unused
# 5 - X11
# 6 - reboot (Do NOT set initdefault to this)
-#
+#
id:3:initdefault:
# System initialization.
Modified: ppcrcd/trunk/conf.dir/etc/rc.d/init.d/gpm
==============================================================================
--- ppcrcd/trunk/conf.dir/etc/rc.d/init.d/gpm (original)
+++ ppcrcd/trunk/conf.dir/etc/rc.d/init.d/gpm Thu Mar 16 00:43:14 2006
@@ -79,7 +79,7 @@
rm -f /var/lock/subsys/gpm >/dev/null 2>&1
else
msg_not_running "Gpm"
- fi
+ fi
;;
restart|force-reload)
$0 stop
Modified: ppcrcd/trunk/conf.dir/etc/rc.d/rc.sysinit
==============================================================================
--- ppcrcd/trunk/conf.dir/etc/rc.d/rc.sysinit (original)
+++ ppcrcd/trunk/conf.dir/etc/rc.d/rc.sysinit Thu Mar 16 00:43:14 2006
@@ -137,7 +137,7 @@
#fi
#run_cmd "udev started ?" udev
-
+
# /dev must be also mounted before everything but only if we want use them ;-)
#if is_yes "$MOUNT_DEVFS"; then
# run_cmd "Mounting Device Filesystem" mount -n -t devfs /dev /dev
@@ -284,8 +284,8 @@
# run_cmd "Unmounting initrd" umount /initrd
# /sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
#fi
-
-# Check for arguments
+
+# Check for arguments
if grep -iq nopnp /proc/cmdline; then
PNP=
else
@@ -320,7 +320,7 @@
# [ -r $file ] && restorecon $file >/dev/null 2>&1
# done
#fi
-
+
# Clear mtab
#:>/etc/mtab
[ -f /etc/cryptomtab ] && :>/etc/cryptomtab
@@ -417,10 +417,10 @@
[ "$alias" = "off" ] && continue
run_cmd "$(nls 'Initializing firewire controller') ($alias)" /sbin/modprobe $alias
done
- LC_ALL=C grep -E "SBP2" /proc/bus/ieee1394/devices 2> /dev/null && /sbin/modprobe -s sbp2 > /dev/null 2>&1
+ LC_ALL=C grep -E "SBP2" /proc/bus/ieee1394/devices 2> /dev/null && /sbin/modprobe -s sbp2 > /dev/null 2>&1
fi
-fi
-
+fi
+
# Load sound modules if they need persistent DMA buffers
if grep -q "^options sound dmabuf=1" "$MODULES_CONF" 2>/dev/null ; then
RETURN=0
@@ -444,7 +444,7 @@
# Find and activate volume groups:
# EVMS
if false ; then
-
+
if [ "$(kernelverser)" -lt "002006" ]; then
# Linux 2.4 core modules
modprobe -s -k evms > /dev/null 2>&1
@@ -455,7 +455,7 @@
# Linux 2.6 core module
modprobe -s -k evmscore > /dev/null 2>&1
fi
-
+
is_yes "$EVMS_GUID_PTABLE" && modprobe -s -k gpt_part >/dev/null 2>&1
is_yes "$EVMS_LVM" && modprobe -s -k lvm_vge >/dev/null 2>&1
is_yes "$EVMS_AIX" && modprobe -s -k AIXlvm_vge >/dev/null 2>&1
@@ -483,8 +483,8 @@
modprobe -s -k dm-mod >/dev/null 2>&1
lvmignorelock=""
fi
-
-
+
+
run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmignorelock && \
run_cmd "Activating LVM volume groups" /sbin/vgchange -a y $lvmignorelock
[ "$lvmversion" = "2" ] && /sbin/vgscan --mknodes $lvmignorelock > /dev/null 2>&1
@@ -499,7 +499,7 @@
goraidtab=1
golvm=0
rc=0
-
+
if [ -x /sbin/mdadm -a -f /etc/mdadm.conf ]; then
if (grep -qE "^([[:blank:]]|)ARRAY[[:blank:]]" /etc/mdadm.conf); then
run_cmd "Starting up RAID devices" /sbin/mdadm --assemble --scan
@@ -507,9 +507,9 @@
[ "$rc" -eq 0 ] && goraidtab=0 && golvm=1
fi
fi
-
+
if [ -f /etc/raidtab -a "$goraidtab" -eq 1 ]; then
-
+
for i in $(grep -v "^#" /etc/raidtab | grep "raiddev" | awk '{print $2}') ; do
golvm=1
RAIDDEV=$(basename $i)
@@ -670,7 +670,7 @@
elif [ "$rc" = "1" -a -x /sbin/quotacheck ]; then
_RUN_QUOTACHECK=1
fi
-
+
show "Remounting encrypted filesystems back in rw mode"; busy
awk '
FILENAME=="/proc/mounts" {
Modified: ppcrcd/trunk/conf.dir/etc/sysconfig/clock
==============================================================================
--- ppcrcd/trunk/conf.dir/etc/sysconfig/clock (original)
+++ ppcrcd/trunk/conf.dir/etc/sysconfig/clock Thu Mar 16 00:43:14 2006
@@ -1,5 +1,5 @@
# $Id: clock 1364 2003-09-22 01:28:35Z arekm $
-# Should the hardware clock be kept in Coordinated Universal Time
+# Should the hardware clock be kept in Coordinated Universal Time
# (instead of local time).
UTC=true
# true means your machine uses epoch 1980 in its hardware clock
Modified: ppcrcd/trunk/conf.dir/lib/udev/udev_net_helper
==============================================================================
--- ppcrcd/trunk/conf.dir/lib/udev/udev_net_helper (original)
+++ ppcrcd/trunk/conf.dir/lib/udev/udev_net_helper Thu Mar 16 00:43:14 2006
@@ -1,7 +1,7 @@
#!/bin/sh
#
# Kernel NET hotplug params include:
-#
+#
# ACTION=%s [register or unregister]
# INTERFACE=%s
@@ -79,7 +79,7 @@
CONF=$(echo "$ETHS" | grep "^$DRIVER:")
if [ -n "$CONF" ]; then
IP=$(echo $CONF | awk -F: '{print $2}')
-
+
GATE=$(echo $CONF | awk -F: '{print $3}')
if [ -n "$GATE" ]; then
sed -e "s/^GATEWAY=.*$/GATEWAY=$GATE/" \
Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/add-ppcrcd-to-nvram.sh
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/add-ppcrcd-to-nvram.sh (original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/add-ppcrcd-to-nvram.sh Thu Mar 16 00:43:14 2006
@@ -30,7 +30,7 @@
# if something fails restore old nvram image
undo_die() {
echo "$2" > /dev/stderr
-
+
echo -n "Reverting old nvram."
dd if=$NVRAM_IN of=/dev/nvram && echo -n . || harddie
nvsetenv > $NVRAM_LIST2 && echo -n . || harddie
Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/find_md
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/find_md (original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/find_md Thu Mar 16 00:43:14 2006
@@ -28,7 +28,7 @@
print "/dev/$f\n" if $f =~ /^[sh]d[a-z][0-9]+$/;
next;
}
-
+
my ($uuid) = grep /UUID/, @out;
chomp $uuid;
$uuid =~ s/\s*UUID\s*:\s*//;
@@ -58,13 +58,13 @@
# dirname: ex: md0_hda2hdc2
my $dirname = "md${cnt}_" . join '', sort @{$by_uuid{$uuid}};
verbose(2, " Preparing /mnt/$dirname");
-
+
printf MD_OUT "DEVICE" . join " /dev/", ('', sort @{$by_uuid{$uuid}});
printf MD_OUT "\nARRAY /dev/md/$cnt uuid=$uuid\n";
-
+
printf FS_OUT "/dev/md$cnt /mnt/$dirname auto defaults,noauto,noatime 0 0\n";
mkdir "/mnt/$dirname";
-
+
printf MO_OUT "install block-major-111-$cnt { /usr/lib/ppcrcd/assemble /dev/md/$cnt; /bin/ln -sf md/$cnt /dev/md$cnt;"
. " mount /mnt/$dirname; }\n";
system("mknod /dev/md/$cnt b 9 $cnt");
Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/load-conf
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/load-conf (original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/load-conf Thu Mar 16 00:43:14 2006
@@ -69,7 +69,7 @@
for DIR in $(egrep "^/dev" /etc/fstab | awk '{print $2}' | egrep "^(/media|/mnt)"); do
mkdir -p $DIR
done
-
+
umount /media/conf
rmdir /media/conf
Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/net-detect
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/net-detect (original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/net-detect Thu Mar 16 00:43:14 2006
@@ -19,7 +19,7 @@
COUNT=0
while [ -n "$1" ]; do
eth=$1
-
+
CARD=$(echo $eth | awk -F: '{print $1}')
IPB=$( echo $eth | awk -F: '{print $2}')
GATE=$(echo $eth | awk -F: '{print $3}')
@@ -27,7 +27,7 @@
verbose 3 " +-Setting $CARD with $IPB IP"
echo "alias eth${COUNT} ${CARD}" >> /etc/modprobe.conf
set_ifcfg eth${COUNT} $IPB $ONBOOT
-
+
if [ -n "$GATE" ]; then
sed -i -e "s/^GATEWAY=.*$/GATEWAY=$GATE/" \
-e "s/^GATEWAYDEV=.*$/GATEWAYDEV=eth${COUNT}/" \
@@ -36,7 +36,7 @@
for DNSip in $(echo $DNS | tr "," " "); do
echo nameserver $DNSip >> /etc/resolv.conf
done
-
+
let $((++COUNT))
shift
done
@@ -47,7 +47,7 @@
#@ | eth=<module>:<ip/mask>[:<gate>[:<dns1>[,<dns2>[,...]]]]
#@ Configure ethernet for ethernet card supported by <module>.
#@ Note: this option may be buggy with autodetection in udev enabled.
-#@ Multiple eth options are allowed.
+#@ Multiple eth options are allowed.
#@ IP/mask can be one of: 192.168.0.2/24, dhcp or pump.
#@ Last eth with gate specified will become default route.
#@ All dns of each eth will be added to '/etc/resolv.conf'.
@@ -58,7 +58,7 @@
if cmdopt noauto; then
# if udev desactived
verbose 1 -G "Setting network cards"
-
+
ETHS=$(cmdvar eth)
if [ -n "$ETHS" ]; then
verbose 2 -B " +-Using cmdline network config"
Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/nvram-add-ppcrcd.pl
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/nvram-add-ppcrcd.pl (original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/nvram-add-ppcrcd.pl Thu Mar 16 00:43:14 2006
@@ -21,7 +21,7 @@
if ( ( $vars eq 1 ) and ( $fout=~/\0\0\0\0\0\0\0\0$/ ) ) {
$fout=~s/\0\0\0\0\0\0\0$/ppcrcd=/ or die "can't change!";
last;
- }
+ }
}
die "can't find boot-command string" unless ( $vars eq 1 );
die "anything has changed, no space left ?" unless $fout=~/ppcrcd=$/;
Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/rc.live
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/rc.live (original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/rc.live Thu Mar 16 00:43:14 2006
@@ -21,7 +21,7 @@
#@ syntax:
#@ | modpre=<module1>[,<module2>[,<module3>[...]]]
#@ Loads modules just after udev start, before debug shell. Ex.:
-#@ | modpre=usbhid,ohci-hcd
+#@ | modpre=usbhid,ohci-hcd
#@@ nonvmodpre: don't load modules specified in nvram modpre option
modpre=$(cmdvar "modpre")
if [ -z "$modpre" ]; then
@@ -37,7 +37,7 @@
#@@ debug:
#@ put debugging information (set -x),
-#@ and runs sh at startup to allow do something
+#@ and runs sh at startup to allow do something
DEBUG=0
if cmdopt debug; then
export DEBUG=1
@@ -92,7 +92,7 @@
cmdopt nodetect || ( \
[ "$CONF_LOADED" -ne 0 ] && \
sh $SHD /usr/lib/ppcrcd/hw-detect )
-
+
sh $SHD /usr/lib/ppcrcd/net-detect
#@@ nonet: Don't start network services at boot time.
@@ -126,7 +126,7 @@
if [ -z "$keytable" ]; then
cmdopt nonvkeytable || keytable=$(nvvar "k(ey){0,1}(map|tab.*)")
fi
-if [ -n "$keytable" ]; then
+if [ -n "$keytable" ]; then
while read map font tables; do
tab="$(echo $tables | tr "[:blank:]" "\n" | egrep -i "^$keytable\$")"
if [ -n "$tab" ]; then
Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/setbootopt
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/setbootopt (original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/setbootopt Thu Mar 16 00:43:14 2006
@@ -33,7 +33,7 @@
cat << EOF
Usage: $0 [-r] [[-f] keytable=<>] [[-f] conf=<>] [[-f] modpre=<>]
[[-f] modules=<>] [[-f] [-rn] eth=<>] [[-f] service=<>]
-
+
-r reset old variables, else not changed variables will permain
must be first arg
-rn reset network (eth=) variables
@@ -47,7 +47,7 @@
* bootoptions: keytable=es modpre=usbhid
# $0 -r keytable=pl
* bootoptions: keytable=pl
-
+
You can find boot options description in /root/ppcrcd.doc/README.opts
EOF
}
@@ -114,7 +114,7 @@
# read new options ###########################################################
while [ -n "$1" ]; do
case "$1" in
- keytab*=*|ktab*=*|keymap=*|kmap=*)
+ keytab*=*|ktab*=*|keymap=*|kmap=*)
TAB=${1#*=}
if [ -z "$FORCE" ]; then
[ -n "$TAB" ] || die 1 "option $1 can't be blank"
Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/xmltar.pl
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/xmltar.pl (original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/xmltar.pl Thu Mar 16 00:43:14 2006
@@ -74,7 +74,7 @@
sub packfile {
my ($file, $step, $localdir, $level) = @_;
-
+
my ( $links, $inode) = (stat "$file")[3, 1];
if ( $links > 1 ) {
if ( $multilink{$inode} ) {
@@ -88,7 +88,7 @@
$multilink{$inode}=$localdir.lastname($file);
}
warn "F $file\n" if $verbose;
-
+
unless ( open F_IN, $file ) {
warn "Can't read file \"$file\": $!\n";
return;
@@ -122,7 +122,7 @@
my ($dir, $step, $localdir, $level) = @_;
warn "D $dir\n" if $verbose;
$localdir .= lastname($dir) . "/";
-
+
print $step."<!--D $localdir {{{$level -->\n" if $comment;
$level++;
print $step . '<xmltar:dir mode="';
Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/xmluntar.pl
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/xmluntar.pl (original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/xmluntar.pl Thu Mar 16 00:43:14 2006
@@ -32,7 +32,7 @@
my $leftmany = 0;
my $dir = "./";
my $L;
-
+
while ( $L = <> ) {
chomp $L;
$L =~ s/^\s*//;
@@ -47,7 +47,7 @@
my $new = $dir.convname($opts{"name"});
rmtree($new);
warn "L $new\n" if $verbose;
- link $to, $new or
+ link $to, $new or
warn "Can't create hardlink '$new' -> '$to': $!\n";
chmod oct($opts{"mode"}), $to if $opts{"mode"};
redo;
@@ -62,7 +62,7 @@
my $new = $dir.convname($opts{"name"});
rmtree($new);
warn "S $new\n" if $verbose;
- symlink $to, $new or
+ symlink $to, $new or
warn "Can't create symlink '$new' -> '$to': $!\n";
redo;
}
More information about the pld-cvs-commit
mailing list