diff --git a/xCAT-server/share/xcat/netboot/SL/genimage b/xCAT-server/share/xcat/netboot/SL/genimage index 44f9a6506..a473e8b09 100755 --- a/xCAT-server/share/xcat/netboot/SL/genimage +++ b/xCAT-server/share/xcat/netboot/SL/genimage @@ -552,29 +552,7 @@ shell() { echo -e " Exit shell to continue booting.\$RESET" \$SHELL } -mountfile () { - snapshotfile=\${NEWROOT}/\${RWDIR}/\${2}\${1} - dir=`dirname \$snapshotfile` -# -# Check if file already exists in snapshot directory. If not attempt to copy -# from root directory to snapshot directory. -# - if [ ! -e \$snapshotfile ]; then - mkdir -p \$dir || echo -e "\${RED}Can't make \$dir\${NORMAL}" - #echo -e "\${YELLOW} \${1} missing from client specific area.\${RESET}" - if [ -e \$NEWROOT/\${1} ] ; then - #echo "Copying \${1}" - rsync -a \$NEWROOT/\${1} \$snapshotfile - else - #echo "Creating \${1}" - touch \$snapshotfile - fi - fi -# -# Mount the snapshotfile over the root file so the client will have r/w access -# - mount -n -o bind \$NEWROOT/\$RWDIR/\${2}\${1} \$NEWROOT/\${1} -} + fancydisplay () { clear diff --git a/xCAT-server/share/xcat/netboot/fedora12/genimage b/xCAT-server/share/xcat/netboot/fedora12/genimage index 1026afaee..a84a5d439 100755 --- a/xCAT-server/share/xcat/netboot/fedora12/genimage +++ b/xCAT-server/share/xcat/netboot/fedora12/genimage @@ -521,29 +521,6 @@ shell() { echo " Exit shell to continue booting.\$RESET" \$SHELL } -mountfile () { - snapshotfile=\${NEWROOT}/\${RWDIR}/\${2}\${1} - dir=`dirname \$snapshotfile` -# -# Check if file already exists in snapshot directory. If not attempt to copy -# from root directory to snapshot directory. -# - if [ ! -e \$snapshotfile ]; then - mkdir -p \$dir || echo "\${RED}Can't make \$dir\${NORMAL}" - #echo "\${YELLOW} \${1} missing from client specific area.\${RESET}" - if [ -e \$NEWROOT/\${1} ] ; then - #echo "Copying \${1}" - rsync -a \$NEWROOT/\${1} \$snapshotfile - else - #echo "Creating \${1}" - touch \$snapshotfile - fi - fi -# -# Mount the snapshotfile over the root file so the client will have r/w access -# - mount -n -o bind \$NEWROOT/\$RWDIR/\${2}\${1} \$NEWROOT/\${1} -} fancydisplay () { clear diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage index f82cda0af..d8e88a682 100755 --- a/xCAT-server/share/xcat/netboot/rh/genimage +++ b/xCAT-server/share/xcat/netboot/rh/genimage @@ -561,29 +561,6 @@ shell() { echo -e " Exit shell to continue booting.\$RESET" \$SHELL } -mountfile () { - snapshotfile=\${NEWROOT}/\${RWDIR}/\${2}\${1} - dir=`dirname \$snapshotfile` -# -# Check if file already exists in snapshot directory. If not attempt to copy -# from root directory to snapshot directory. -# - if [ ! -e \$snapshotfile ]; then - mkdir -p \$dir || echo -e "\${RED}Can't make \$dir\${NORMAL}" - #echo -e "\${YELLOW} \${1} missing from client specific area.\${RESET}" - if [ -e \$NEWROOT/\${1} ] ; then - #echo "Copying \${1}" - rsync -a \$NEWROOT/\${1} \$snapshotfile - else - #echo "Creating \${1}" - touch \$snapshotfile - fi - fi -# -# Mount the snapshotfile over the root file so the client will have r/w access -# - mount -n -o bind \$NEWROOT/\$RWDIR/\${2}\${1} \$NEWROOT/\${1} -} fancydisplay () { clear diff --git a/xCAT-server/share/xcat/netboot/rh/genimage.rh4 b/xCAT-server/share/xcat/netboot/rh/genimage.rh4 index 31dd1c83a..6cc910045 100755 --- a/xCAT-server/share/xcat/netboot/rh/genimage.rh4 +++ b/xCAT-server/share/xcat/netboot/rh/genimage.rh4 @@ -535,29 +535,6 @@ shell() { echo -e " Exit shell to continue booting.\$RESET" \$SHELL } -mountfile () { - snapshotfile=\${NEWROOT}/\${RWDIR}/\${2}\${1} - dir=`dirname \$snapshotfile` -# -# Check if file already exists in snapshot directory. If not attempt to copy -# from root directory to snapshot directory. -# - if [ ! -e \$snapshotfile ]; then - mkdir -p \$dir || echo -e "\${RED}Can't make \$dir\${NORMAL}" - #echo -e "\${YELLOW} \${1} missing from client specific area.\${RESET}" - if [ -e \$NEWROOT/\${1} ] ; then - #echo "Copying \${1}" - rsync -a \$NEWROOT/\${1} \$snapshotfile - else - #echo "Creating \${1}" - touch \$snapshotfile - fi - fi -# -# Mount the snapshotfile over the root file so the client will have r/w access -# - mount -n -o bind \$NEWROOT/\$RWDIR/\${2}\${1} \$NEWROOT/\${1} -} fancydisplay () { clear diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage index 23f800034..d0639ee8c 100755 --- a/xCAT-server/share/xcat/netboot/sles/genimage +++ b/xCAT-server/share/xcat/netboot/sles/genimage @@ -637,29 +637,7 @@ shell() { echo -e " Exit shell to continue booting.\$RESET" \$SHELL } -mountfile () { - snapshotfile=\${NEWROOT}/\${RWDIR}/\${2}\${1} - dir=`dirname \$snapshotfile` -# -# Check if file already exists in snapshot directory. If not attempt to copy -# from root directory to snapshot directory. -# - if [ ! -e \$snapshotfile ]; then - mkdir -p \$dir || echo -e "\${RED}Can't make \$dir\${NORMAL}" - #echo -e "\${YELLOW} \${1} missing from client specific area.\${RESET}" - if [ -e \$NEWROOT/\${1} ] ; then - #echo "Copying \${1}" - rsync -a \$NEWROOT/\${1} \$snapshotfile - else - #echo "Creating \${1}" - touch \$snapshotfile - fi - fi -# -# Mount the snapshotfile over the root file so the client will have r/w access -# - mount -n -o bind \$NEWROOT/\$RWDIR/\${2}\${1} \$NEWROOT/\${1} -} + fancydisplay () { clear echo -e "\$CYAN"