From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 2106b71eb555e29ff85d9bab0d1312642b730f59
Date: Wed, 08 Jan 2014 18:10:06 +0100 [thread overview]
Message-ID: <20140108171007.9306920C2D@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 5922 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, fifteen has been updated
via 2106b71eb555e29ff85d9bab0d1312642b730f59 (commit)
via 4ed7ef4620637d6047edc4fd713e753d3a7f254e (commit)
via 010ea13643caa3aac57e7b9829273cb27bf93198 (commit)
from 96cbae14d7ad23028eea2701210a312003d4b199 (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 2106b71eb555e29ff85d9bab0d1312642b730f59
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jan 8 18:09:09 2014 +0100
fifteen: convert some settings at update.
commit 4ed7ef4620637d6047edc4fd713e753d3a7f254e
Merge: 010ea13 96cbae1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jan 8 17:20:07 2014 +0100
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
commit 010ea13643caa3aac57e7b9829273cb27bf93198
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jan 8 16:01:50 2014 +0100
fifteen: add pakfire to updater.
-----------------------------------------------------------------------
Summary of changes:
.../38 => core/fifteen}/filelists/e2fsprogs | 0
config/rootfiles/core/fifteen/filelists/files | 1 +
config/rootfiles/core/fifteen/filelists/pakfire | 4 ++++
config/rootfiles/core/fifteen/update.sh | 21 ++++++++++++++++-----
4 files changed, 21 insertions(+), 5 deletions(-)
copy config/rootfiles/{oldcore/38 => core/fifteen}/filelists/e2fsprogs (100%)
create mode 100644 config/rootfiles/core/fifteen/filelists/pakfire
Difference in files:
diff --git a/config/rootfiles/core/fifteen/filelists/e2fsprogs b/config/rootfiles/core/fifteen/filelists/e2fsprogs
new file mode 120000
index 0000000..37b55de
--- /dev/null
+++ b/config/rootfiles/core/fifteen/filelists/e2fsprogs
@@ -0,0 +1 @@
+../../../common/e2fsprogs
\ No newline at end of file
diff --git a/config/rootfiles/core/fifteen/filelists/files b/config/rootfiles/core/fifteen/filelists/files
index ff725c9..e01aac4 100644
--- a/config/rootfiles/core/fifteen/filelists/files
+++ b/config/rootfiles/core/fifteen/filelists/files
@@ -2,6 +2,7 @@ etc/system-release
etc/issue
etc/collectd.conf
etc/rc.d/init.d/network
+run
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/gui.cgi
srv/web/ipfire/cgi-bin/index.cgi
diff --git a/config/rootfiles/core/fifteen/filelists/pakfire b/config/rootfiles/core/fifteen/filelists/pakfire
new file mode 100644
index 0000000..fd324bb
--- /dev/null
+++ b/config/rootfiles/core/fifteen/filelists/pakfire
@@ -0,0 +1,4 @@
+opt/pakfire/etc/pakfire.conf
+opt/pakfire/lib/functions.pl
+opt/pakfire/lib/functions.sh
+opt/pakfire/pakfire
diff --git a/config/rootfiles/core/fifteen/update.sh b/config/rootfiles/core/fifteen/update.sh
index a31f7d3..2bbb539 100644
--- a/config/rootfiles/core/fifteen/update.sh
+++ b/config/rootfiles/core/fifteen/update.sh
@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2013 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
@@ -107,6 +107,8 @@ add_to_backup usr/local/bin/setxtaccess
add_to_backup usr/local/bin/outgoingfwctrl
add_to_backup srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
add_to_backup var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
+add_to_backup etc/inittab
+add_to_backup etc/fstab
# Backup the files
tar cJvf /var/ipfire/backup/core-upgrade$core_$KVER.tar.xz \
@@ -238,6 +240,15 @@ rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
# Remove old firewall configuration files
rm -rf /var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
+# Convert inittab and fstab
+sed -i -e "s/tty1 9600$/tty1 9600 --noclear/g" /etc/inittab
+sed -i -e "s/^proc/#proc/g" /etc/fstab
+sed -i -e "s/^sysfs/#sysfs/g" /etc/fstab
+sed -i -e "s/^devpts/#devpts/g" /etc/fstab
+
+# Convert udev persistent network rules
+sed -i -e "s/SYSFS{/ATTR{/g" /etc/udev/rules.d/30-persistent-network.rules
+
#
# Start services
#
@@ -312,16 +323,16 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
"core-update-$core: WARNING not enough space for pae kernel."
else
echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
- echo "ProgVersion: 3.10.24" >> /opt/pakfire/db/installed/meta-linux-pae
- echo "Release: 30" >> /opt/pakfire/db/installed/meta-linux-pae
+ echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+ echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae
fi
fi
# Force reinstall xen kernel if it was installed
if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then
echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen
- echo "ProgVersion: 2.6.32.60" >> /opt/pakfire/db/installed/meta-linux-xen
- echo "Release: 24" >> /opt/pakfire/db/installed/meta-linux-xen
+ echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen
+ echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen
# Add xvc0 to /etc/securetty
echo "xvc0" >> /etc/securetty
fi
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2014-01-08 17:10 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140108171007.9306920C2D@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox