rpms/initscripts/OLPC-2 initscripts-8.54.1-dont-install-orig.patch, NONE, 1.1 initscripts-8.54.1-prettyboot.patch, NONE, 1.1 initscripts-8.54.1-readonly.patch, NONE, 1.1 initscripts-8.54.1-olpc.patch, 1.8, 1.9 initscripts.spec, 1.151, 1.152
C. Scott Ananian (cscott)
fedora-extras-commits at redhat.com
Mon Oct 1 20:43:31 UTC 2007
Author: cscott
Update of /cvs/pkgs/rpms/initscripts/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7984/OLPC-2
Modified Files:
initscripts-8.54.1-olpc.patch initscripts.spec
Added Files:
initscripts-8.54.1-dont-install-orig.patch
initscripts-8.54.1-prettyboot.patch
initscripts-8.54.1-readonly.patch
Log Message:
OLPC-specific improvements:
Improve Makefile so that we don't install the original versions of
patched files in /etc/rc.d and /etc/sysconfig.
Split "readonly rootfs / tmpfs" parts of olpc patch into new 'readonly'
patch; plus add additional support for preserving changes to /etc/ssh,
/etc/sysconfig/i18n, /etc/timezone, /var/lib/dbus/machine-id, and
/var/lib/random-seed.
Add "pretty boot" support: bring up localhost before rhgb-client is invoked;
some additional calls to rhgb-client; move setsysfont from rc.sysinit to
z-boot-anim-stop (after animation has finished and DCON is frozen); make
sure that we cleanly exit pretty boot if interactive boot mode is invoked.
initscripts-8.54.1-dont-install-orig.patch:
--- NEW FILE initscripts-8.54.1-dont-install-orig.patch ---
diff -up initscripts-8.54.1/Makefile.dont-install-orig initscripts-8.54.1/Makefile
--- initscripts-8.54.1/Makefile.dont-install-orig 2006-11-28 18:58:26.000000000 -0500
+++ initscripts-8.54.1/Makefile 2007-09-27 15:01:47.000000000 -0400
@@ -39,7 +39,12 @@ install:
mkdir -p $(ROOT)/etc/X11
install -m755 prefdm $(ROOT)/etc/X11/prefdm
- cp -af rc.d sysconfig ppp udev $(ROOT)/etc
+ install -m755 -d $(ROOT)/etc/rc.d $(ROOT)/etc/sysconfig
+ install -m755 rc.d/rc rc.d/rc.local rc.d/rc.sysinit $(ROOT)/etc/rc.d/
+ cp -af rc.d/init.d $(ROOT)/etc/rc.d/
+ install -m755 sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
+ cp -af sysconfig/network-scripts $(ROOT)/etc/sysconfig/
+ cp -af ppp udev $(ROOT)/etc
mkdir -p $(ROOT)/etc/ppp/peers
chmod 755 $(ROOT)/etc/rc.d/* $(ROOT)/etc/rc.d/init.d/*
chmod 755 $(ROOT)/etc/ppp/peers
@@ -60,8 +65,6 @@ install:
mkdir -p $(ROOT)/etc/sysconfig/console
if uname -m | grep -q s390 ; then \
install -m644 sysconfig/init.s390 $(ROOT)/etc/sysconfig/init ; \
- else \
- rm -f $(ROOT)/etc/sysconfig/init.s390 ; \
fi
mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/sbin
initscripts-8.54.1-prettyboot.patch:
--- NEW FILE initscripts-8.54.1-prettyboot.patch ---
diff -up initscripts-8.54.1/rc.d/rc.sysinit.prettyboot initscripts-8.54.1/rc.d/rc.sysinit
--- initscripts-8.54.1/rc.d/rc.sysinit.prettyboot 2007-05-08 08:21:47.000000000 -0400
+++ initscripts-8.54.1/rc.d/rc.sysinit 2007-09-27 14:40:46.000000000 -0400
@@ -11,6 +11,14 @@ unamer=`uname -r`
set -m
+if [ -x /usr/bin/rhgb-client ] ; then
+ # OLPC's rhgb-client depends on localhost being up
+ /sbin/ip addr add 127.0.0.1/8 dev lo
+ /sbin/ip addr add ::1/128 dev lo
+ /sbin/ip link set lo up
+ /usr/bin/rhgb-client --update=sysinit-top # early "we're alive" indication
+fi
+
if [ -f /etc/sysconfig/network ]; then
. /etc/sysconfig/network
fi
@@ -228,9 +236,10 @@ init_crypto() {
return $ret
}
-if [ -x /sbin/setsysfont -a -c /dev/tty1 ]; then
- /sbin/setsysfont < /dev/tty1 > /dev/tty1 2>/dev/null
-fi
+# OLPC does the setsysfont later, in z-boot-anim-stop after DCON is frozen.
+#if [ -x /sbin/setsysfont -a -c /dev/tty1 ]; then
+# /sbin/setsysfont < /dev/tty1 > /dev/tty1 2>/dev/null
+#fi
# Print a text banner.
echo -en $"\t\tWelcome to "
@@ -327,10 +336,13 @@ if [ -x /bin/taskset ]; then
fi
fi
+update_boot_stage udev
+( sleep 3 ; update_boot_stage udev_mid ) &
nashpid=$(pidof nash 2>/dev/null)
[ -n "$nashpid" ] && kill $nashpid >/dev/null 2>&1
unset nashpid
/sbin/start_udev
+update_boot_stage udev_post
# Load other user-defined modules
for file in /etc/sysconfig/modules/*.modules ; do
diff -up initscripts-8.54.1/rc.d/rc.prettyboot initscripts-8.54.1/rc.d/rc
--- initscripts-8.54.1/rc.d/rc.prettyboot 2007-09-27 14:38:55.000000000 -0400
+++ initscripts-8.54.1/rc.d/rc 2007-09-27 14:40:10.000000000 -0400
@@ -31,6 +31,8 @@ export runlevel previous
if [ "$previous" = "N" ]; then
if [ -f /var/run/confirm ]; then
echo $"Entering interactive startup"
+ # bail out of pretty boot
+ chvt 1
else
echo $"Entering non-interactive startup"
fi
initscripts-8.54.1-readonly.patch:
--- NEW FILE initscripts-8.54.1-readonly.patch ---
diff -up initscripts-8.54.1/rwtab.readonly initscripts-8.54.1/rwtab
--- initscripts-8.54.1/rwtab.readonly 2007-04-13 18:44:55.000000000 -0400
+++ initscripts-8.54.1/rwtab 2007-09-27 13:57:37.000000000 -0400
@@ -24,10 +24,7 @@ empty /var/tux
empty /media
files /etc/adjtime
-files /etc/fstab
-files /etc/mtab
files /etc/ntp.conf
-files /etc/resolv.conf
files /etc/lvm/.cache
files /etc/lvm/archive
files /etc/lvm/backup
@@ -38,3 +35,4 @@ files /var/lib/iscsi
files /var/lib/logrotate.status
files /var/lib/ntp
files /var/lib/xen
+files /home/olpc/.Xauthority
diff -up initscripts-8.54.1/statetab.readonly initscripts-8.54.1/statetab
--- initscripts-8.54.1/statetab.readonly 2006-10-27 13:02:22.000000000 -0400
+++ initscripts-8.54.1/statetab 2007-09-27 14:20:11.000000000 -0400
@@ -10,3 +10,8 @@
# /etc/ssh
# /var/spool/mail
#
+/etc/ssh
+/etc/sysconfig/i18n
+/etc/timezone
+/var/lib/dbus
+/var/lib/random-seed
diff -up initscripts-8.54.1/sysconfig/readonly-root.readonly initscripts-8.54.1/sysconfig/readonly-root
--- initscripts-8.54.1/sysconfig/readonly-root.readonly 2007-04-13 18:48:20.000000000 -0400
+++ initscripts-8.54.1/sysconfig/readonly-root 2007-09-27 14:17:39.000000000 -0400
@@ -2,7 +2,7 @@
READONLY=no
# Set to 'yes' to mount various temporary state as either tmpfs
# or on the block device labelled RW_LABEL. Implied by READONLY
-TEMPORARY_STATE=no
+TEMPORARY_STATE=yes
# Place to put a tmpfs for temporary scratch writable space
RW_MOUNT=/var/lib/stateless/writable
# Label on local filesystem which can be used for temporary scratch space
@@ -12,6 +12,6 @@ RW_OPTIONS=
# Label for partition with persistent data
STATE_LABEL=stateless-state
# Where to mount to the persistent data
-STATE_MOUNT=/var/lib/stateless/state
+STATE_MOUNT=/security/state
# Options to use for peristent mount
STATE_OPTIONS=
initscripts-8.54.1-olpc.patch:
Index: initscripts-8.54.1-olpc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts-8.54.1-olpc.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- initscripts-8.54.1-olpc.patch 18 Sep 2007 15:33:15 -0000 1.8
+++ initscripts-8.54.1-olpc.patch 1 Oct 2007 20:42:58 -0000 1.9
@@ -1,22 +1,3 @@
-diff -up initscripts-8.54.1/rwtab.olpc initscripts-8.54.1/rwtab
---- initscripts-8.54.1/rwtab.olpc 2007-04-13 18:44:55.000000000 -0400
-+++ initscripts-8.54.1/rwtab 2007-09-13 13:31:32.000000000 -0400
-@@ -24,10 +24,7 @@ empty /var/tux
- empty /media
-
- files /etc/adjtime
--files /etc/fstab
--files /etc/mtab
- files /etc/ntp.conf
--files /etc/resolv.conf
- files /etc/lvm/.cache
- files /etc/lvm/archive
- files /etc/lvm/backup
-@@ -38,3 +35,4 @@ files /var/lib/iscsi
- files /var/lib/logrotate.status
- files /var/lib/ntp
- files /var/lib/xen
-+files /home/olpc/.Xauthority
diff -up initscripts-8.54.1/inittab.olpc initscripts-8.54.1/inittab
--- initscripts-8.54.1/inittab.olpc 2006-10-12 13:51:04.000000000 -0400
+++ initscripts-8.54.1/inittab 2007-09-13 13:31:32.000000000 -0400
Index: initscripts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/initscripts/OLPC-2/initscripts.spec,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- initscripts.spec 18 Sep 2007 15:33:15 -0000 1.151
+++ initscripts.spec 1 Oct 2007 20:42:58 -0000 1.152
@@ -3,10 +3,13 @@
Version: 8.54.1
License: GPL
Group: System Environment/Base
-Release: 8%{?dist}
+Release: 9%{?dist}
Source: initscripts-%{version}.tar.bz2
Source1: olpc-login
-Patch0: initscripts-8.54.1-olpc.patch
+Patch0: initscripts-8.54.1-dont-install-orig.patch
+Patch1: initscripts-8.54.1-olpc.patch
+Patch2: initscripts-8.54.1-readonly.patch
+Patch3: initscripts-8.54.1-prettyboot.patch
BuildRoot: /%{_tmppath}/%{name}-%{version}-%{release}-root
Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
Requires: /sbin/sysctl, syslog
@@ -37,7 +40,10 @@
%prep
%setup -q
-%patch0 -p1 -b .olpc
+%patch0 -p1 -b .dont-install-orig
+%patch1 -p1 -b .olpc
+%patch2 -p1 -b .readonly
+%patch3 -p1 -b .prettyboot
%build
make
More information about the fedora-extras-commits
mailing list