diff -Nru rootskel-1.73/debian/changelog rootskel-1.73ubuntu1/debian/changelog --- rootskel-1.73/debian/changelog 2008-12-27 05:36:12.000000000 +0100 +++ rootskel-1.73ubuntu1/debian/changelog 2009-01-06 10:57:29.000000000 +0100 @@ -1,3 +1,14 @@ +rootskel (1.73ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #309949), Ubuntu remaining changes: + - Provide the ability to choose a remote logging host and port if + specified on the kernel command line. + - init: Added support for disabling the shells on tty2 and tty3 by + specifying a 'noshell' option on the kernel cmdline. Useful for + unattended installations in a public place. + + -- Alessio Treglia Tue, 06 Jan 2009 10:56:23 +0100 + rootskel (1.73) unstable; urgency=low * hppa: load hilkbd module and register the module for inclusion in initrd @@ -26,12 +37,34 @@ -- Frans Pop Fri, 05 Dec 2008 14:08:21 +0100 +rootskel (1.70ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #303879) + - Provide the ability to choose a remote logging host and port if + specified on the kernel command line. + - init: Add support for disabling the shells on tty2 and tty3 by + specifying a 'noshell' option on the kernel cmdline. Useful for + unattended installations in a public place. + + -- Bhavani Shankar Mon, 01 Dec 2008 11:30:18 +0530 + rootskel (1.70) unstable; urgency=low * Support real devices for console on s390. (closes: #504760) -- Bastian Blank Sat, 29 Nov 2008 22:02:53 +0100 +rootskel (1.69ubuntu1) jaunty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Provide the ability to choose a remote logging host and port if + specified on the kernel command line. + - init: Add support for disabling the shells on tty2 and tty3 by + specifying a 'noshell' option on the kernel cmdline. Useful for + unattended installations in a public place. + + -- Colin Watson Mon, 03 Nov 2008 12:24:43 +0000 + rootskel (1.69) unstable; urgency=low [ Frans Pop ] @@ -119,6 +152,17 @@ -- Joey Hess Mon, 07 Jul 2008 14:03:14 -0400 +rootskel (1.62ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Provide the ability to choose a remote logging host and port if + specified on the kernel command line. + - init: Add support for disabling the shells on tty2 and tty3 by + specifying a 'noshell' option on the kernel cmdline. Useful for + unattended installations on a public place. + + -- Colin Watson Wed, 11 Jun 2008 19:53:07 +0100 + rootskel (1.62) unstable; urgency=low [ Frans Pop ] @@ -178,6 +222,23 @@ -- Frans Pop Sat, 22 Mar 2008 23:14:41 +0100 +rootskel (1.58ubuntu2) hardy; urgency=low + + * init: Add support for disabling the shells on tty2 and tty3 by specifying + a 'noshell' -option on the kernel cmdline. Useful for unattended + installations on a public place. + + -- Timo Aaltonen Wed, 06 Feb 2008 16:53:35 +0200 + +rootskel (1.58ubuntu1) hardy; urgency=low + + [ Matt T. Proud ] + * debian-installer-startup.d/S10syslog: Provide the ability to choose a + remote logging host and port if specified on the kernel command line + (LP: #184130). + + -- Colin Watson Mon, 04 Feb 2008 17:07:06 +0000 + rootskel (1.58) unstable; urgency=low [ dann frazier ] @@ -1720,3 +1781,4 @@ * Initial Release. -- David Whedon Tue, 30 Jan 2001 00:52:08 -0800 + diff -Nru rootskel-1.73/debian/control rootskel-1.73ubuntu1/debian/control --- rootskel-1.73/debian/control 2008-09-05 19:52:25.000000000 +0200 +++ rootskel-1.73ubuntu1/debian/control 2008-12-27 10:54:52.000000000 +0100 @@ -1,7 +1,8 @@ Source: rootskel Section: debian-installer Priority: standard -Maintainer: Debian Install System Team +Maintainer: Ubuntu Installer Team +XSBC-Original-Maintainer: Debian Install System Team Uploaders: Joey Hess , Colin Watson , Bastian Blank , Frans Pop Build-Depends: debhelper (>= 4.2), dpkg-dev (>= 1.7.0), libklibc-dev Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/rootskel diff -Nru rootskel-1.73/src/init rootskel-1.73ubuntu1/src/init --- rootskel-1.73/src/init 2008-09-15 14:14:29.000000000 +0200 +++ rootskel-1.73ubuntu1/src/init 2008-12-27 10:54:51.000000000 +0100 @@ -14,6 +14,9 @@ init=*) init=${i#init=} ;; + noshell) + sed -i '/^tty2\|^tty3/s/^tty/\#tty/' /etc/inittab + ;; esac done debugshell "before init" diff -Nru rootskel-1.73/src/lib/debian-installer-startup.d/S10syslog rootskel-1.73ubuntu1/src/lib/debian-installer-startup.d/S10syslog --- rootskel-1.73/src/lib/debian-installer-startup.d/S10syslog 2006-07-26 00:49:54.000000000 +0200 +++ rootskel-1.73ubuntu1/src/lib/debian-installer-startup.d/S10syslog 2008-12-27 10:54:51.000000000 +0100 @@ -1,6 +1,24 @@ +for option in $(cat /proc/cmdline); do + case $option in + log_host=*) + log_host="${option#log_host=}" + ;; + log_port=*) + log_port="${option#log_port=}" + ;; + esac +done + +if [ -n "$log_host" ]; then + logging_options="-L -R $log_host" + if [ -n "$log_port" ]; then + logging_options="$logging_options:$log_port" + fi +fi + echo -n "Starting system log daemon: " modprobe -q unix 2> /dev/null || true -/sbin/syslogd -m 0 -O /var/log/syslog -S +/sbin/syslogd -m 0 -O /var/log/syslog -S $logging_options echo -n "syslogd, " /sbin/klogd -c 2 echo "klogd."