astlinux-commits

[Astlinux-commits] SF.net SVN: astlinux:[5219] branches/1.0/project/astlinux/target_skeleton/ etc/init.d/FIRSTRUN

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

Revision: 5219
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5219&view=rev
Author:   abelbeck
Date:     2011-10-19 18:54:18 +0000 (Wed, 19 Oct 2011)
Log Message:
-----------
FIRSTRUN, updated for 1.0 series

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN	2011-10-19 13:30:32 UTC (rev 5218)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN	2011-10-19 18:54:18 UTC (rev 5219)
@@ -23,19 +23,13 @@
 
     case $new in
 
-      astlinux-0.7*)
+      astlinux-1.0*)
         if /usr/sbin/upgrade-arno-firewall checkMajor; then  # Don't auto-upgrade if a major version change
           /usr/sbin/upgrade-arno-firewall upgrade
         fi
-        ;;
-
-      astlinux-0.8*)
-        if /usr/sbin/upgrade-arno-firewall checkMajor; then  # Don't auto-upgrade if a major version change
-          /usr/sbin/upgrade-arno-firewall upgrade
-        fi
         case $old in
           astlinux-0.7*)
-            # 0.7 -> 0.8 upgrade scripts
+            # 0.7 -> 1.0 upgrade scripts
             ;;
         esac
         ;;

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

[Astlinux-commits] SF.net SVN: astlinux:[5412] branches/1.0/project/astlinux/target_skeleton/ etc/init.d/FIRSTRUN

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

Revision: 5412
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5412&view=rev
Author:   abelbeck
Date:     2012-01-26 11:44:59 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
FIRSTRUN, cleanup ASTURW /var/run/utmp file caused by Busybox bug fixed in commit r5411

Revision Links:
--------------
    http://astlinux.svn.sourceforge.net/astlinux/?rev=5411&view=rev

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN	2012-01-26 10:59:06 UTC (rev 5411)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN	2012-01-26 11:44:59 UTC (rev 5412)
@@ -5,6 +5,16 @@
 
 . /etc/rc.conf
 
+cleanup_asturw_utmp()
+{
+  if rm /oldroot/mnt/asturw/var/run/utmp; then
+    if rmdir /oldroot/mnt/asturw/var/run; then
+      rmdir /oldroot/mnt/asturw/var
+    fi
+  fi
+}
+
+
 init () {
   local new old=""
   
@@ -24,9 +34,16 @@
     case $new in
 
       astlinux-1.0*)
+        # Upgrade AIF firewall supporting files
         if /usr/sbin/upgrade-arno-firewall checkMajor; then  # Don't auto-upgrade if a major version change
           /usr/sbin/upgrade-arno-firewall upgrade
         fi
+
+        # Cleanup ASTURW /var/run/utmp file caused by Busybox bug fixed in commit r5411
+        if [ -f /oldroot/mnt/asturw/var/run/utmp ]; then
+          cleanup_asturw_utmp 2>/dev/null
+        fi
+
         case $old in
           astlinux-0.7*)
             # 0.7 -> 1.0 upgrade scripts

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

[Astlinux-commits] SF.net SVN: astlinux:[5925] branches/1.0/project/astlinux/target_skeleton/ etc/init.d/FIRSTRUN

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

Revision: 5925
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5925&view=rev
Author:   abelbeck
Date:     2013-01-23 01:08:19 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
FIRSTRUN, update for new 1.1.x versions

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN	2013-01-23 00:01:16 UTC (rev 5924)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN	2013-01-23 01:08:19 UTC (rev 5925)
@@ -33,20 +33,15 @@
 
     case $new in
 
-      astlinux-1.0*)
+      astlinux-1.1.*|astlinux-1.0-*)
         # Upgrade AIF firewall supporting files
         if /usr/sbin/upgrade-arno-firewall checkMajor; then  # Don't auto-upgrade if a major version change
           /usr/sbin/upgrade-arno-firewall upgrade
         fi
 
-        # Cleanup ASTURW /var/run/utmp file caused by Busybox bug fixed in commit r5411
-        if [ -f /oldroot/mnt/asturw/var/run/utmp ]; then
-          cleanup_asturw_utmp 2>/dev/null
-        fi
-
         case $old in
           astlinux-0.7*)
-            # 0.7 -> 1.0 upgrade scripts
+            # 0.7 -> 1.x upgrade scripts
             ;;
         esac
         ;;

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

[Astlinux-commits] SF.net SVN: astlinux:[5926] branches/1.0/project/astlinux/target_skeleton/ etc/init.d/FIRSTRUN

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

Revision: 5926
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5926&view=rev
Author:   abelbeck
Date:     2013-01-23 01:30:31 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
FIRSTRUN, simplify, no need to test the current version, we know what we are

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN	2013-01-23 01:08:19 UTC (rev 5925)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN	2013-01-23 01:30:31 UTC (rev 5926)
@@ -5,16 +5,6 @@
 
 . /etc/rc.conf
 
-cleanup_asturw_utmp()
-{
-  if rm /oldroot/mnt/asturw/var/run/utmp; then
-    if rmdir /oldroot/mnt/asturw/var/run; then
-      rmdir /oldroot/mnt/asturw/var
-    fi
-  fi
-}
-
-
 init () {
   local new old=""
   
@@ -31,22 +21,17 @@
 
     cp -p /etc/astlinux-release /mnt/kd/astlinux-release
 
-    case $new in
+    # Upgrade AIF firewall supporting files
+    if /usr/sbin/upgrade-arno-firewall checkMajor; then  # Don't auto-upgrade if a major version change
+      /usr/sbin/upgrade-arno-firewall upgrade
+    fi
 
-      astlinux-1.1.*|astlinux-1.0-*)
-        # Upgrade AIF firewall supporting files
-        if /usr/sbin/upgrade-arno-firewall checkMajor; then  # Don't auto-upgrade if a major version change
-          /usr/sbin/upgrade-arno-firewall upgrade
-        fi
-
-        case $old in
-          astlinux-0.7*)
-            # 0.7 -> 1.x upgrade scripts
-            ;;
-        esac
+    case $old in
+      astlinux-1.0.*)
+        # 1.0.x -> Current upgrade scripts
         ;;
-
     esac
+
   else
     echo "  no version change."
   fi

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

[Astlinux-commits] SF.net SVN: astlinux:[5936] branches/1.0/project/astlinux/target_skeleton/ etc/init.d/FIRSTRUN

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

Revision: 5936
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5936&view=rev
Author:   abelbeck
Date:     2013-01-29 00:13:31 +0000 (Tue, 29 Jan 2013)
Log Message:
-----------
FIRSTRUN, Update system default user/group files to ASTURW files

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN	2013-01-28 21:40:24 UTC (rev 5935)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN	2013-01-29 00:13:31 UTC (rev 5936)
@@ -5,6 +5,21 @@
 
 . /etc/rc.conf
 
+add_system_default_users()
+{
+  local base="$1" user file IFS
+
+  unset IFS
+  for user in zabbix prosody; do
+    for file in passwd shadow group; do
+      if ! grep -q "^${user}:" "/etc/${file}"; then
+        grep "^${user}:" "${base}/etc/${file}" >> "/etc/${file}"
+        echo "FIRSTRUN: Added system default '${user}' user/group to '/etc/${file}'"
+      fi
+    done
+  done
+}
+
 init () {
   local new old=""
   
@@ -26,6 +41,13 @@
       /usr/sbin/upgrade-arno-firewall upgrade
     fi
 
+    # Update system default user/group files to ASTURW files
+    if [ -d /oldroot/mnt/asturo ]; then
+      add_system_default_users /oldroot/mnt/asturo
+    elif [ -d /oldroot/image ]; then
+      add_system_default_users /oldroot/image
+    fi
+
     case $old in
       astlinux-1.0.*)
         # 1.0.x -> Current upgrade scripts

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

[Astlinux-commits] SF.net SVN: astlinux:[6280] branches/1.0/project/astlinux/target_skeleton/ etc/init.d/FIRSTRUN

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

Revision: 6280
          http://sourceforge.net/p/astlinux/code/6280
Author:   abelbeck
Date:     2013-11-15 23:49:21 +0000 (Fri, 15 Nov 2013)
Log Message:
-----------
FIRSTRUN, automatically update any ASTURW /etc/passwd and /etc/group 'nobody' entries

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN	2013-11-15 20:56:20 UTC (rev 6279)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN	2013-11-15 23:49:21 UTC (rev 6280)
@@ -20,6 +20,22 @@
   done
 }
 
+update_system_default_users()
+{
+  local base="$1" user file current IFS
+
+  unset IFS
+  for user in nobody; do
+    for file in passwd group; do
+      current="$(grep "^${user}:" "${base}/etc/${file}")"
+      if [ -n "$current" -a "$current" != "$(grep "^${user}:" "/etc/${file}")" ]; then
+        sed -i -e "s|^${user}:.*$|${current}|" "/etc/${file}"
+        echo "FIRSTRUN: Updated system default '${user}' user/group in '/etc/${file}'"
+      fi
+    done
+  done
+}
+
 init () {
   local new old=""
   
@@ -44,8 +60,10 @@
     # Update system default user/group files to ASTURW files
     if [ -d /oldroot/mnt/asturo ]; then
       add_system_default_users /oldroot/mnt/asturo
+      update_system_default_users /oldroot/mnt/asturo
     elif [ -d /oldroot/image ]; then
       add_system_default_users /oldroot/image
+      update_system_default_users /oldroot/image
     fi
 
     case $old in

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

[Astlinux-commits] SF.net SVN: astlinux:[6747] branches/1.0/project/astlinux/target_skeleton/ etc/init.d/FIRSTRUN

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

Revision: 6747
          http://sourceforge.net/p/astlinux/code/6747
Author:   abelbeck
Date:     2014-10-04 21:20:06 +0000 (Sat, 04 Oct 2014)
Log Message:
-----------
followup to r6746, no need for new update_root_passwd_default() function, use existing update_system_default_users()

Revision Links:
--------------
    http://sourceforge.net/p/astlinux/code/6746

Modified Paths:
--------------
    branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN

Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN	2014-10-03 23:51:54 UTC (rev 6746)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN	2014-10-04 21:20:06 UTC (rev 6747)
@@ -25,7 +25,7 @@
   local base="$1" user file current IFS
 
   unset IFS
-  for user in nobody; do
+  for user in root nobody; do
     for file in passwd group; do
       current="$(grep "^${user}:" "${base}/etc/${file}")"
       if [ -n "$current" -a "$current" != "$(grep "^${user}:" "/etc/${file}")" ]; then
@@ -36,17 +36,6 @@
   done
 }
 
-update_root_passwd_default()
-{
-  local base="$1" current
-
-  current="$(grep "^root:" "${base}/etc/passwd")"
-  if [ -n "$current" -a "$current" != "$(grep "^root:" "/etc/passwd")" ]; then
-    sed -i -e "s|^root:.*$|${current}|" "/etc/passwd"
-    echo "FIRSTRUN: Updated system default 'root' user in '/etc/passwd'"
-  fi
-}
-
 init () {
   local new old=""
   
@@ -72,11 +61,9 @@
     if [ -d /oldroot/mnt/asturo ]; then
       add_system_default_users /oldroot/mnt/asturo
       update_system_default_users /oldroot/mnt/asturo
-      update_root_passwd_default /oldroot/mnt/asturo
     elif [ -d /oldroot/image ]; then
       add_system_default_users /oldroot/image
       update_system_default_users /oldroot/image
-      update_root_passwd_default /oldroot/image
     fi
 
     case $old in

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