* [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 10885fa912d583ddf3e545174747b70254e35c92
@ 2012-11-21 20:26 git
0 siblings, 0 replies; only message in thread
From: git @ 2012-11-21 20:26 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 6513 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, thirteen has been updated
via 10885fa912d583ddf3e545174747b70254e35c92 (commit)
via 5691eba9443f8851b95b95294ed1210e220eff51 (commit)
via 5254aa51955ec88b4994486caa98e24b8541c0ac (commit)
via b9c73f663286c61cf184a1fca2cd7ccff78b4e42 (commit)
from 6a8ea85102d5154a3fb6efbe8a344cbf3d5c9c19 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 10885fa912d583ddf3e545174747b70254e35c92
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Nov 21 20:40:15 2012 +0100
updater: add bridge-utils.
commit 5691eba9443f8851b95b95294ed1210e220eff51
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Nov 21 18:33:00 2012 +0100
updater: don't use pakfire function for untar.
This updater should now work also with older testreleases of IPFire 2.13.
commit 5254aa51955ec88b4994486caa98e24b8541c0ac
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Nov 21 18:27:44 2012 +0100
initskripts: do more syncing on shutdown.
commit b9c73f663286c61cf184a1fca2cd7ccff78b4e42
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Nov 21 18:16:36 2012 +0100
updater: add acpid initskripts.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/65/filelists/bridge-utils | 1 +
config/rootfiles/core/65/filelists/files | 7 ++++++-
config/rootfiles/core/65/filelists/i586/acpi-init | 4 ++++
config/rootfiles/core/65/update.sh | 10 ++--------
src/initscripts/init.d/halt | 6 ++++++
src/initscripts/init.d/mountfs | 2 ++
src/initscripts/init.d/reboot | 7 ++++++-
7 files changed, 27 insertions(+), 10 deletions(-)
create mode 120000 config/rootfiles/core/65/filelists/bridge-utils
create mode 100644 config/rootfiles/core/65/filelists/i586/acpi-init
mode change 100755 => 100644 src/initscripts/init.d/minidlna
mode change 100755 => 100644 src/initscripts/init.d/network-vlans
Difference in files:
diff --git a/config/rootfiles/core/65/filelists/bridge-utils b/config/rootfiles/core/65/filelists/bridge-utils
new file mode 120000
index 0000000..3dee211
--- /dev/null
+++ b/config/rootfiles/core/65/filelists/bridge-utils
@@ -0,0 +1 @@
+../../../common/bridge-utils
\ No newline at end of file
diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files
index 398d722..bcccb2b 100644
--- a/config/rootfiles/core/65/filelists/files
+++ b/config/rootfiles/core/65/filelists/files
@@ -3,10 +3,13 @@ etc/issue
etc/sysctl.conf
etc/securetty
opt/pakfire/etc/pakfire.conf
-etc/rc.d/init.d/partresize
etc/rc.d/init.d/firewall
etc/rc.d/init.d/fsresize
+etc/rc.d/init.d/halt
+etc/rc.d/init.d/mountfs
etc/rc.d/init.d/network
+etc/rc.d/init.d/partresize
+etc/rc.d/init.d/reboot
etc/rc.d/init.d/sendsignals
etc/rc.d/init.d/setclock
etc/rc.d/init.d/tmpfs
@@ -14,6 +17,8 @@ etc/rc.d/init.d/udev
etc/rc.d/init.d/udev_retry
etc/rc.d/rc0.d/K47setclock
etc/rc.d/rc6.d/K47setclock
+opt/pakfire/db/core/mine
+opt/pakfire/lib/functions.sh
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/ids.cgi
srv/web/ipfire/cgi-bin/qos.cgi
diff --git a/config/rootfiles/core/65/filelists/i586/acpi-init b/config/rootfiles/core/65/filelists/i586/acpi-init
new file mode 100644
index 0000000..982638a
--- /dev/null
+++ b/config/rootfiles/core/65/filelists/i586/acpi-init
@@ -0,0 +1,4 @@
+etc/rc.d/init.d/acpid
+etc/rc.d/rc0.d/K87acpid
+etc/rc.d/rc3.d/S12acpid
+etc/rc.d/rc6.d/K87acpid
diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh
index 024920d..904287b 100644
--- a/config/rootfiles/core/65/update.sh
+++ b/config/rootfiles/core/65/update.sh
@@ -43,16 +43,10 @@ done
#
# Do some sanity checks.
-
-if [ "$(grep " xavf " /opt/pakfire/lib/functions.sh)" == "" ]; then
- /usr/bin/logger -p syslog.emerg -t core-upgrade-$core \
- "ERROR: this update need a newer pakfire version (core64)."
- exit 1
-fi
if [ ! "$(mount | grep " reiser4 (")" == "" ]; then
/usr/bin/logger -p syslog.emerg -t core-upgrade-$core \
"ERROR: cannot update because there is a reiser4 fs mounted."
- exit 2
+ exit 1
fi
#
@@ -143,7 +137,7 @@ rm -rf /lib/libncurses*
#
#Extract files
-extract_files
+tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
#
# Start services
diff --git a/src/initscripts/init.d/halt b/src/initscripts/init.d/halt
index f3b016c..01f7234 100644
--- a/src/initscripts/init.d/halt
+++ b/src/initscripts/init.d/halt
@@ -17,6 +17,12 @@
case "${1}" in
stop)
+ sync && sync
+ boot_mesg "Remount root readonly..."
+ mount -f -o remount,ro / > /dev/null 2>&1
+ evaluate_retval
+ boot_mesg "Prepare for halt..."
+ sleep 2
halt -d -f -i -p
;;
*)
diff --git a/src/initscripts/init.d/minidlna b/src/initscripts/init.d/minidlna
old mode 100755
new mode 100644
diff --git a/src/initscripts/init.d/mountfs b/src/initscripts/init.d/mountfs
index 01ecafd..c561009 100644
--- a/src/initscripts/init.d/mountfs
+++ b/src/initscripts/init.d/mountfs
@@ -42,6 +42,8 @@ case "${1}" in
stop)
boot_mesg "Syncing discs..."
sync && sync
+ sleep 2
+ sync && sync
evaluate_retval
boot_mesg "Unmounting all other currently mounted file systems..."
diff --git a/src/initscripts/init.d/network-vlans b/src/initscripts/init.d/network-vlans
old mode 100755
new mode 100644
diff --git a/src/initscripts/init.d/reboot b/src/initscripts/init.d/reboot
index fec0c1f..0602ac4 100644
--- a/src/initscripts/init.d/reboot
+++ b/src/initscripts/init.d/reboot
@@ -17,7 +17,12 @@
case "${1}" in
stop)
- boot_mesg "Restarting system..."
+ sync && sync
+ boot_mesg "Remount root readonly..."
+ mount -f -o remount,ro / > /dev/null 2>&1
+ evaluate_retval
+ boot_mesg "Prepare for reboot..."
+ sleep 2
reboot -d -f -i
;;
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-11-21 20:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-21 20:26 [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 10885fa912d583ddf3e545174747b70254e35c92 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox