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

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

Revision: 8361
          http://sourceforge.net/p/astlinux/code/8361
Author:   abelbeck
Date:     2017-06-01 13:02:20 +0000 (Thu, 01 Jun 2017)
Log Message:
-----------
core system, never remove a directory in the path '/oldroot/mnt/asturw/...' as unionfs with kernel 3.16 has an issue with that.  Removing a file in the '/oldroot/mnt/asturw/...' path appears to be OK.  The 'show-union' command now only shows files, so as not to encourage directory removal, except 'show-union all' shows directories as well

Modified Paths:
--------------
    branches/1.0/package/asterisk/upgrade-asterisk-sounds
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/show-union

Modified: branches/1.0/package/asterisk/upgrade-asterisk-sounds
===================================================================
--- branches/1.0/package/asterisk/upgrade-asterisk-sounds	2017-05-30 22:55:04 UTC (rev 8360)
+++ branches/1.0/package/asterisk/upgrade-asterisk-sounds	2017-06-01 13:02:20 UTC (rev 8361)
@@ -110,7 +110,7 @@
 
   unset IFS
   cat "$file" | while read filename; do
-    rm -f "$ASTURW$dir/$filename"
+    rm -f "$dir/$filename"
   done
 }
 
@@ -221,14 +221,6 @@
   reload_asterisk_moh $type
 }
 
-remove_all() {
-
-  rm -rf $ASTURW$BASE/sounds/
-  rm -rf $ASTURW$BASE/moh/
-  
-  reload_asterisk_moh moh
-}
-
 show() {
   local str=""
 
@@ -291,22 +283,12 @@
   exit $GREEN
   ;;
 
-remove-all)
-  if [ -n "$2" ]; then
-    echo "Usage: upgrade-asterisk-sounds remove-all"
-    exit 1
-  fi
-  remove_all
-  echo "Successful remove-all, all ASTURW sounds and moh files have been removed."
-  exit $GREEN
-  ;;
-
 show)
   show
   ;;
 
 *)
-  echo "Usage: upgrade-asterisk-sounds upgrade|remove|remove-all|show"
+  echo "Usage: upgrade-asterisk-sounds upgrade|remove|show"
   echo "                                 core|extra|moh"
   echo "                                   $LANGUAGES"
   echo "                                     $CODECS"

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale	2017-05-30 22:55:04 UTC (rev 8360)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/set-locale	2017-06-01 13:02:20 UTC (rev 8361)
@@ -90,8 +90,8 @@
 
 remove()
 {
-  if [ -d "$ASTURW$BASE" ]; then
-    rm -rf "$ASTURW$BASE"
+  if [ -d "$BASE" ]; then
+    rm -rf "$BASE"
   fi
 }
 

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/show-union
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/show-union	2017-05-30 22:55:04 UTC (rev 8360)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/show-union	2017-06-01 13:02:20 UTC (rev 8361)
@@ -11,11 +11,12 @@
 
 system()
 {
-  find $ASTURW | grep -v -e "^$ASTURW/$KD" \
-                         -e "^$ASTURW/$ASTERISK_SOUNDS" \
-                         -e "^$ASTURW/$ASTERISK_MOH" \
-                         -e "^$ASTURW/$PACKAGES" \
-                         -e "^$ASTURW/$LOCALE"
+  find $ASTURW -type f | \
+    grep -v -e "^$ASTURW/$KD" \
+            -e "^$ASTURW/$ASTERISK_SOUNDS" \
+            -e "^$ASTURW/$ASTERISK_MOH" \
+            -e "^$ASTURW/$PACKAGES" \
+            -e "^$ASTURW/$LOCALE"
 }
 
 kd()
@@ -23,7 +24,7 @@
   if mount | grep -q "/$KD"; then
     echo "/$KD is not on ASTURW. /$KD is a separate partition." >&2
   else
-    find $ASTURW/$KD
+    find $ASTURW/$KD -type f
   fi
 }
 
@@ -30,12 +31,12 @@
 asterisk_sounds()
 {
   if [ -d $ASTURW/$ASTERISK_SOUNDS ]; then
-    find $ASTURW/$ASTERISK_SOUNDS
+    find $ASTURW/$ASTERISK_SOUNDS -type f
   else
     echo "No Asterisk Sounds on ASTURW." >&2
   fi
   if [ -d $ASTURW/$ASTERISK_MOH ]; then
-    find $ASTURW/$ASTERISK_MOH
+    find $ASTURW/$ASTERISK_MOH -type f
   else
     echo "No Asterisk MOH Sounds on ASTURW." >&2
   fi
@@ -44,7 +45,7 @@
 packages()
 {
   if [ -d $ASTURW/$PACKAGES ]; then
-    find $ASTURW/$PACKAGES
+    find $ASTURW/$PACKAGES -type f
   else
     echo "No Installed Packages on ASTURW." >&2
   fi
@@ -53,7 +54,7 @@
 locale()
 {
   if [ -d $ASTURW/$LOCALE ]; then
-    find $ASTURW/$LOCALE
+    find $ASTURW/$LOCALE -type f
   else
     echo "No Installed Locale on ASTURW." >&2
   fi

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