diff options
| author |   Eric Thibodeau <kyron@neuralbs.com> | 2008-07-18 09:04:23 -0400 |
|---|---|---|
| committer | Eric Thibodeau <kyron@neuralbs.com> | 2008-07-18 09:04:23 -0400 |
| commit | d74941757e6933c98a7ed7f614ec259dbd92df8b (patch) | |
| tree | e66176cc0c239e2a5017219784271f1c1271743a /catalyst | |
| parent | NFSv4 provisionning (diff) | |
| download | clustering-livecd-d74941757e6933c98a7ed7f614ec259dbd92df8b.tar.gz clustering-livecd-d74941757e6933c98a7ed7f614ec259dbd92df8b.tar.bz2 clustering-livecd-d74941757e6933c98a7ed7f614ec259dbd92df8b.zip | |
Added module selectability (unionfs Vs aufs)
Diffstat (limited to 'catalyst')
| -rwxr-xr-x | catalyst/nfsroot/2008.0/overlay/boot/stateless.sh | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/catalyst/nfsroot/2008.0/overlay/boot/stateless.sh b/catalyst/nfsroot/2008.0/overlay/boot/stateless.sh index 6884bcf..39e9071 100755 --- a/catalyst/nfsroot/2008.0/overlay/boot/stateless.sh +++ b/catalyst/nfsroot/2008.0/overlay/boot/stateless.sh @@ -12,9 +12,9 @@ IFCONFIG=/sbin/ifconfig NODE_NAME="node" ahostname(){ - if [ -z ${MYHOST} ]; then + if [[ -z ${MYHOST} || ${MYHOST} == ${MYIP} ]]; then echo "DHCP didn't tell me my name. Generating my own hostname..." - MYHOST="${NODE_NAME}${IP##*.}" + MYHOST="${NODE_NAME}${MYIP##*.}" echo "I proclaim that I am $MYHOST !!" else echo DHCP told me my hostname is ${MYHOST}... @@ -52,12 +52,11 @@ isset() { } aunionfs() { -# $MODPROBE unionfs while [ "$1" != "" ]; do echo "STATELESS: Mounting tmpfs $1 ..." - mount -n -t tmpfs -o defaults none /mnt/unionfs/$1 - echo "STATELESS: Mounting $1 unionfs ..." - mount -n -t unionfs -o dirs=/mnt/unionfs/$1=rw:/$1=ro none /$1 + mount -n -t tmpfs -o defaults tmpfs_$1 /mnt/$UNIONMOD/$1 + echo "STATELESS: Mounting $1 using $UNIONMOD ..." + mount -n -t $UNIONMOD -o dirs=/mnt/$UNIONMOD/$1=rw:/$1=ro ${UNIONMOD}_$1 /$1 shift done } @@ -71,8 +70,6 @@ ahosts() { echo "$ROOTSERV rootserver" >> /etc/hosts echo "Setting up fstab" echo "$ROOTSERV:$ROOTPATH / nfs ro,defaults,hard,intr,actimeo=120,timeo=14,tcp 0 1" > /etc/fstab - # We'll add this temporarily for testing, switching to autofs ASAP: - echo "$ROOTSERV:/home /home nfs ro,defaults,hard,intr,actimeo=120,timeo=14,tcp 0 1" >> /etc/fstab } # get_param: parses parameters in PARSELINE which could be, for example, the kernel's command line @@ -93,7 +90,7 @@ get_param() { echo $* else shift $PARAM - echo $1 + iecho $1 fi return 0 ;; @@ -121,8 +118,19 @@ import_dhcp_info() { ROOTSERV=$(get_param rootserver 1) } +import_cmdline() { + mount -n -t proc none /proc + PARSELINE=$(cat /proc/cmdline) + UNIONMOD=$(get_param unionmod 1) +} + + import_dhcp_info -aunionfs etc var tmp +if [ ! -z $UNIONMOD ]; then + echo "Loading $UNIONMOD" + $MODPROBE $UNIONMOD + aunionfs etc var tmp +fi ahostname ahosts exec /sbin/init |