[Astlinux-commits] SF.net SVN: astlinux:[8318] branches/1.0

[<abe...@us...>]

Revision: 8318
          http://sourceforge.net/p/astlinux/code/8318
Author:   abelbeck
Date:     2017-05-21 02:36:00 +0000 (Sun, 21 May 2017)
Log Message:
-----------
Remove old, seldom/never used BOOTONLY runnix feature

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
    branches/1.0/scripts/astlinux-makeimage

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image	2017-05-21 00:38:48 UTC (rev 8317)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image	2017-05-21 02:36:00 UTC (rev 8318)
@@ -52,62 +52,6 @@
   rmdir /tmp/runup
 }
 
-mirror_bootonly_runnix() {
-  local action="$1"
-
-  if [ ! -x /sbin/findfs ]; then
-    return 2
-  fi
-
-  # Check if a BOOTONLY drive exists.
-  LABEL=$(/sbin/findfs LABEL=BOOTONLY 2>/dev/null)
-  if [ -n "$LABEL" ]; then
-    mkdir /tmp/bootonly >/dev/null
-    if ! mount -t vfat -o rw "$LABEL" /tmp/bootonly >/dev/null; then
-      rmdir /tmp/bootonly
-      return 1
-    fi
-  else
-    # No BOOTONLY drive
-    return 1
-  fi
-
-  # Mirror the runnix files from the RUNNIX drive to the BOOTONLY drive.
-  if [ -f /tmp/bootonly/runnix -a -f "$BASE/ver" -a -f "$BASE/runnix" -a -f "$BASE/runnix.img" ]; then
-    for install in ver runnix runnix.img; do
-      if [ -f "/tmp/bootonly/$install" ]; then
-        rm -f "/tmp/bootonly/$install"
-      fi
-      cp -a "$BASE/$install" "/tmp/bootonly/$install"
-    done
-
-    if [ "$action" = "upgrade" ]; then
-      for install in memtest boot.msg syslinux.cfg; do
-        if [ -f "$BASE/$install" ]; then
-          if [ -f "/tmp/bootonly/$install" ]; then
-            rm -f "/tmp/bootonly/$install"
-          fi
-          cp -a "$BASE/$install" "/tmp/bootonly/$install"
-        fi
-      done
-    fi
-
-    if [ -f "$BASE/Xver" -a -f "$BASE/Xrunnix" -a -f "$BASE/Xrunnix.img" ]; then
-      for install in Xver Xrunnix Xrunnix.img; do
-        if [ -f "/tmp/bootonly/$install" ]; then
-          rm -f "/tmp/bootonly/$install"
-        fi
-        cp -a "$BASE/$install" "/tmp/bootonly/$install"
-      done
-    fi
-  fi
-
-  cd /tmp
-  umount /tmp/bootonly
-  rmdir /tmp/bootonly
-  return 0
-}
-
 check() {
   IS_SERIAL=""
   
@@ -271,8 +215,6 @@
     
     echo "$VER" > $BASE/ver
     rm -r $BASE/rtmp/
-    
-    mirror_bootonly_runnix upgrade
   else
     unmount_tmpfs_runup
     rm -r $BASE/rtmp/
@@ -343,8 +285,6 @@
     echo $VER > $BASE/Xver
     echo $XVER > $BASE/ver
     mount -o ro,remount /oldroot/cdrom >/dev/null
-    
-    mirror_bootonly_runnix revert
   else
     echo "Revert failed, unable to exchange files."
     exit $RED

Modified: branches/1.0/scripts/astlinux-makeimage
===================================================================
--- branches/1.0/scripts/astlinux-makeimage	2017-05-21 00:38:48 UTC (rev 8317)
+++ branches/1.0/scripts/astlinux-makeimage	2017-05-21 02:36:00 UTC (rev 8318)
@@ -41,7 +41,6 @@
 }
 
 ASTRW_FORMAT=
-BOOT_ONLY=
 DUMP_PARTITIONS=
 GZIP=
 
@@ -50,9 +49,6 @@
   -A)
     ASTRW_FORMAT=1
     ;;
-  -B)
-    BOOT_ONLY=1
-    ;;
   -p)
     DUMP_PARTITIONS=1
     ;;
@@ -195,11 +191,7 @@
 
 sudo losetup -o $(($p1*512)) ${LOOPD}1 runnix.img
 
-if [ -n "$BOOT_ONLY" ]; then
-  LABEL="BOOTONLY"
-else
-  LABEL="RUNNIX"
-fi
+LABEL="RUNNIX"
 sudo mkdosfs -F 16 -n $LABEL ${LOOPD}1
 
 echo "
@@ -224,13 +216,7 @@
 sudo mkdir -p /mnt/runnix
 sudo mount -t vfat ${LOOPD}1 /mnt/runnix
 
-if [ -n "$BOOT_ONLY" ]; then
-  for install in $(ls -1 $RUNFS_DIR | grep -v '^os$'); do
-    sudo cp -P --preserve=mode,timestamps ${RUNFS_DIR}/${install} /mnt/runnix
-  done
-else
-  sudo cp -r -P --preserve=mode,timestamps ${RUNFS_DIR}/. /mnt/runnix
-fi
+sudo cp -r -P --preserve=mode,timestamps ${RUNFS_DIR}/. /mnt/runnix
 
 # run this in a subshell, since we change subdirectory
 (
@@ -268,11 +254,7 @@
 
 sudo losetup -d ${LOOPD}0
 
-if [ -n "$BOOT_ONLY" ]; then
-  IMG_NAME="runnix-$RUNNIX_VER-bootonly.img"
-else
-  IMG_NAME="$ASTVER.img"
-fi
+IMG_NAME="$ASTVER.img"
 
 mv -f runnix.img $IMG_NAME
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.