From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 10af520f16fb1019a2bcee3c2101bfaa22f0ccb8
Date: Mon, 12 Nov 2012 23:42:48 +0100 [thread overview]
Message-ID: <20121112224248.C8183200AF@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 5318 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 10af520f16fb1019a2bcee3c2101bfaa22f0ccb8 (commit)
via ef2534611b60a65513bfc61537d711457a497657 (commit)
via 919eb671a30a4b3d3ca6ca0886f05bf3ab1a43f0 (commit)
from b21b0df6a666936b48592aa825fe1950d32ff21a (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 10af520f16fb1019a2bcee3c2101bfaa22f0ccb8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Nov 12 23:42:08 2012 +0100
grub: create default file.
grub will not boot if the file not exist.
commit ef2534611b60a65513bfc61537d711457a497657
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Nov 12 23:41:17 2012 +0100
acpid: use acpid for powerbutton shutdown.
commit 919eb671a30a4b3d3ca6ca0886f05bf3ab1a43f0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Nov 12 23:40:17 2012 +0100
flash-images: fix grub path.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/i586/grub | 1 +
config/rootfiles/common/i586/initscripts | 2 +-
lfs/flash-images | 4 ++--
lfs/grub | 5 ++++-
src/initscripts/sysconfig/rc.local | 5 -----
5 files changed, 8 insertions(+), 9 deletions(-)
Difference in files:
diff --git a/config/rootfiles/common/i586/grub b/config/rootfiles/common/i586/grub
index 43084f7..de6a53b 100644
--- a/config/rootfiles/common/i586/grub
+++ b/config/rootfiles/common/i586/grub
@@ -1,4 +1,5 @@
#boot/grub
+boot/grub/default
boot/grub/grub.conf
boot/grub/ipfire.xpm.gz
boot/grub/stage1
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 3b384c8..8092a16 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -3,7 +3,7 @@
etc/rc.d/helper/getdnsfromdhcpc.pl
etc/rc.d/helper/writeipac.pl
#etc/rc.d/init.d
-#etc/rc.d/init.d/acpid
+etc/rc.d/init.d/acpid
#etc/rc.d/init.d/alsa
#etc/rc.d/init.d/amavisd
etc/rc.d/init.d/apache
diff --git a/lfs/flash-images b/lfs/flash-images
index e43d53e..36a343d 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -120,7 +120,7 @@ ifneq "$(MACHINE_TYPE)" "arm"
ln -s grub.conf $(MNThdd)/boot/grub/menu.lst
# Copy grub files manually
- cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/
+ cp -f $(MNThdd)/usr/lib/grub/i386-pc/* $(MNThdd)/boot/grub/
endif
# Setup symlink for partresize at first boot...
diff --git a/lfs/grub b/lfs/grub
index 8d58099..6850a3a 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -92,5 +92,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
[ -f $$i ] && cp -f $$i /boot/grub; \
done
+ # generate default file
+ grub-set-default 0
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/initscripts/sysconfig/rc.local b/src/initscripts/sysconfig/rc.local
index 5b89b82..83ea8e7 100644
--- a/src/initscripts/sysconfig/rc.local
+++ b/src/initscripts/sysconfig/rc.local
@@ -20,8 +20,3 @@
###############################################################################
# Used for private calls after boot #
###############################################################################
-
-# power button shutdown
-if grep -q '^button' /proc/modules ; then
- ( head -1 /proc/acpi/event | grep -q 'button/power PWRF' && poweroff ) &
-fi
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-11-12 22:42 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=20121112224248.C8183200AF@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