Update of /cvsroot/ssic-linux/openssi/distro-pkgs/redhat/initscripts/rc.d
In directory sc8-pr-cvs1:/tmp/cvs-serv29189/distro-pkgs/redhat/initscripts/rc.d
Modified Files:
Tag: OPENSSI-RH
halt.node rc.sysinit.nodeup
Log Message:
Phase 1 fstab/failover plan (support mounts/swaps on all nodes)
Now /etc/fstab.ssi format used in /etc/fstab, still works on base kernel boot
ci/cluster-tools/libcluster/clusterfstab.c
ci/kernel/include/linux/cluster.h
Rewrite remove_opt()
New function ssi_getnodes_entry()
Return a list of nodes from fstab options
Simplify ssi_thisnode_entry() by calling ssi_getnodes_entry()
New function ssi_qualify_dev()
Convert /dev/name to qualified /dev/#/name
New function ssi_get_dev_node()
Get node number of qualified dev name /dev/#/name
Disable get_fstab(), just output warning and return "/etc/fstab"
openssi/distro-pkgs/redhat/initscripts/rc.d/halt.node
Don't umount nfs mounts here so that clusternode_shutdown doesn't
umount nfs mounts on the rest of cluster.
openssi/distro-pkgs/redhat/initscripts/rc.d/rc.sysinit.nodeup
Perform fsck/mount of local mounts on joining node
openssi/docs/README.clusterfstab
Update description to talk about /etc/fstab instead of /etc/fstab.ssi
openssi/docs/README.upgrade
Describe procedure after an upgrade to set-up /etc/fstab
openssi/docs/lyx/INSTALL.lyx
Add information about getting swap added to /etc/fstab
openssi/e2fsprogs/debugfs/Makefile.in
openssi/e2fsprogs/e2fsck/Makefile.in
openssi/e2fsprogs/misc/Makefile.in
openssi/e2fsprogs/resize/Makefile.in
openssi/e2fsprogs/tests/progs/Makefile.in
openssi/e2fsprogs/lib/ext2fs/ismounted.c
Add -lcluster to linking in makefiles
Fix check_mntent_file() to compare dev_t/nodenum for EXT2_MF_MOUNTED
openssi/e2fsprogs/misc/fsck.c
Don't need to call get_fstab() in fsck anymore
openssi/kernel/cluster/ssi/util/nfs_mount.c
Support MNT_DETACH so we can umount NFS filesystem during shutdown
openssi/openssi-tools/sysadmin/clusterfstab.pl
Put node=* for nfs filesystems, /mnt/floppy and /mnt/cdrom
BUG FIX: partition_print() processing /proc/partitions
Minor fix to the format of generated swap entries
Change usage to take a node number argument
Support a convert /etc/fstab.orig to /etc/fstab mode
Otherwise, go into add dependent node mode as before
openssi/openssi-tools/sysadmin/openssi_cluster_create
Upon initial install call clusterfstab.pl to convert /etc/fstab
openssi/util-linux/mount/fstab.h
openssi/util-linux/mount/swapon.c
Don't need to call get_fstab() anymore
openssi/util-linux/mount/mntent.c
openssi/util-linux/mount/mount.c
Convert specified device names to fully qualified /dev/#/name names
Convert device names to fully qualified before writing to /etc/mtab
openssi/util-linux/mount/umount.c
Only umount filesystems for devices on the local node
Index: halt.node
===================================================================
RCS file:
/cvsroot/ssic-linux/openssi/distro-pkgs/redhat/initscripts/rc.d/Attic/halt.node,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** halt.node 15 Nov 2003 01:42:38 -0000 1.1.2.3
--- halt.node 19 Nov 2003 02:08:44 -0000 1.1.2.4
***************
*** 27,31 ****
grep -v '^[0-9a-f]* ' /proc/mounts | awk '$2 ~
/^\/$|^\/proc|^\/dev/{next}
$3 == "tmpfs" || $3 == "proc" {print $2 ; next}
! /(^#|loopfs|autofs|devfs|^none|^\/dev\/root)/ {next}
{print $2}'
}
--- 27,31 ----
grep -v '^[0-9a-f]* ' /proc/mounts | awk '$2 ~
/^\/$|^\/proc|^\/dev/{next}
$3 == "tmpfs" || $3 == "proc" {print $2 ; next}
! /(^#|nfs|loopfs|autofs|devfs|^none|^\/dev\/root)/ {next}
{print $2}'
}
Index: rc.sysinit.nodeup
===================================================================
RCS file:
/cvsroot/ssic-linux/openssi/distro-pkgs/redhat/initscripts/rc.d/Attic/rc.sysinit.nodeup,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** rc.sysinit.nodeup 7 Oct 2003 22:18:04 -0000 1.1.2.3
--- rc.sysinit.nodeup 19 Nov 2003 02:08:44 -0000 1.1.2.4
***************
*** 202,210 ****
# fastboot=yes
#fi
! #
! #if [ -f /fsckoptions ]; then
! # fsckoptions=`cat /fsckoptions`
! #fi
! #
#if [ -f /forcefsck ]; then
# fsckoptions="-f $fsckoptions"
--- 202,210 ----
# fastboot=yes
#fi
!
! if [ -f /fsckoptions ]; then
! fsckoptions=`cat /fsckoptions`
! fi
!
#if [ -f /forcefsck ]; then
# fsckoptions="-f $fsckoptions"
***************
*** 238,249 ****
# fsckoptions="$AUTOFSCK_OPT $fsckoptions"
#fi
! #
! #if [ "$BOOTUP" = "color" ]; then
! # fsckoptions="-C $fsckoptions"
! #else
! # fsckoptions="-V $fsckoptions"
! #fi
! #
! #
#_RUN_QUOTACHECK=0
#ROOTFSTYPE=`awk '/ \/ / && ($3 !~ /rootfs/) { print $3 }' /proc/mounts`
--- 238,249 ----
# fsckoptions="$AUTOFSCK_OPT $fsckoptions"
#fi
!
! if [ "$BOOTUP" = "color" ]; then
! fsckoptions="-C $fsckoptions"
! else
! fsckoptions="-V $fsckoptions"
! fi
!
!
#_RUN_QUOTACHECK=0
#ROOTFSTYPE=`awk '/ \/ / && ($3 !~ /rootfs/) { print $3 }' /proc/mounts`
***************
*** 317,321 ****
# Start up swapping.
- # SSI_XXX: For now this only works if all swap partition same as on root node
action $"Activating swap partitions: " swapon -a -e
--- 317,320 ----
***************
*** 469,517 ****
fi
! #_RUN_QUOTACHECK=0
! ## Check filesystems
! #if [ -z "$fastboot" ]; then
! # STRING=$"Checking filesystems"
! # echo $STRING
! # initlog -c "fsck -T -R -A -a $fsckoptions"
! # rc=$?
! # if [ "$rc" = "0" ]; then
! # success "$STRING"
! # echo
! # elif [ "$rc" = "1" ]; then
! # passed "$STRING"
! # echo
! # fi
! #
! # # A return of 2 or higher means there were serious problems.
! # if [ $rc -gt 1 ]; then
! # if [ "$BOOTUP" = "graphical" ]; then
! # chvt 1
! # fi
! #
! # failure "$STRING"
! # echo
! # echo
! # echo $"*** An error occurred during the file system check."
! # echo $"*** Dropping you to a shell; the system will reboot"
! # echo $"*** when you leave the shell."
! #
! # str=$"(Repair filesystem)"
! # PS1="$str \# # "; export PS1
! # sulogin
! #
! # echo $"Unmounting file systems"
! # umount -a
# mount -n -o remount,ro /
! # echo $"Automatic reboot in progress."
! # reboot -f
# elif [ "$rc" = "1" -a -x /sbin/quotacheck ]; then
# _RUN_QUOTACHECK=1
! # fi
# Mount all other filesystems (except for NFS and /proc, which is already
# mounted). Contrary to standard usage,
# filesystems are NOT unmounted in single user mode.
! #action $"Mounting local filesystems: " mount -a -t nonfs,smbfs,ncpfs -O
no_netdev
/sbin/cmount
# SSI_XXX: Do this again because gfs fails with ERESTARTSYS -512 for some
reason
--- 468,517 ----
fi
! _RUN_QUOTACHECK=0
! # Check filesystems
! if [ -z "$fastboot" ]; then
! STRING=$"Checking filesystems"
! echo $STRING
! initlog -c "fsck -T -R -A -a $fsckoptions"
! rc=$?
! if [ "$rc" = "0" ]; then
! success "$STRING"
! echo
! elif [ "$rc" = "1" ]; then
! passed "$STRING"
! echo
! fi
!
! # A return of 2 or higher means there were serious problems.
! if [ $rc -gt 1 ]; then
! if [ "$BOOTUP" = "graphical" ]; then
! chvt 1
! fi
!
! failure "$STRING"
! echo
! echo
! echo $"*** An error occurred during the file system check."
! echo $"*** Dropping you to a shell; the node will reboot"
! echo $"*** when you leave the shell."
!
! str=$"(Repair filesystem)"
! PS1="$str \# # "; export PS1
! sulogin
!
! echo $"Unmounting file systems"
! umount -a
# mount -n -o remount,ro /
! echo $"Automatic reboot in progress."
! reboot -L -f
# elif [ "$rc" = "1" -a -x /sbin/quotacheck ]; then
# _RUN_QUOTACHECK=1
! fi
! fi
# Mount all other filesystems (except for NFS and /proc, which is already
# mounted). Contrary to standard usage,
# filesystems are NOT unmounted in single user mode.
! action $"Mounting local filesystems: " mount -a -t nonfs,smbfs,ncpfs -O
no_netdev
/sbin/cmount
# SSI_XXX: Do this again because gfs fails with ERESTARTSYS -512 for some
reason
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
|
