ubuntu-server-iso-testing-dev team mailing list archive

[Jean-Baptiste Lallement <jean-baptiste@xxxxxxxxxx>]

Jean-Baptiste Lallement has proposed merging lp:~jibel/ubuntu-server-iso-testing/desktop-logging-to-serial into lp:ubuntu-server-iso-testing.

Requested reviews:
  Ubuntu Server Iso Testing Developers (ubuntu-server-iso-testing-dev)

For more details, see:
https://code.launchpad.net/~jibel/ubuntu-server-iso-testing/desktop-logging-to-serial/+merge/83861
-- 
https://code.launchpad.net/~jibel/ubuntu-server-iso-testing/desktop-logging-to-serial/+merge/83861
Your team Ubuntu Server Iso Testing Developers is requested to review the proposed merge of lp:~jibel/ubuntu-server-iso-testing/desktop-logging-to-serial into lp:ubuntu-server-iso-testing.

=== modified file 'templates.desktop/custom-installation/hooks/casper-bottom.sh'
--- templates.desktop/custom-installation/hooks/casper-bottom.sh	2011-08-19 20:43:16 +0000
+++ templates.desktop/custom-installation/hooks/casper-bottom.sh	2011-11-29 22:02:25 +0000
@@ -50,11 +50,23 @@
 EOF
 }
 
+override_target() {
+    # Override livefs environment with what has been loaded
+    # on the live cd
+    if [ -d /custom-installation ]; then 
+        cp -af /custom-installation/target-override/* /root/ || true
+        rm -rf /custom-installation/target-override* || true
+    fi
+}
 #gct -s -t bool /desktop/gnome/interface/accessibility true
 #create_desktopfile
 
 # Copy the test script which is run from the desktop file
-cp /run_test.wrapper /root/usr/local/bin/
-cp /run_test /root/usr/local/bin/
+#cp /run_test.wrapper /root/usr/local/bin/
+#cp /run_test /root/usr/local/bin/
+
+override_target
+
+sed -i 's/^%admin.*/%admin ALL=(ALL) NOPASSWD: ALL/' /root/etc/sudoers
 
 log_end_msg

=== added directory 'templates.desktop/custom-installation/target-override'
=== added directory 'templates.desktop/custom-installation/target-override/etc'
=== added directory 'templates.desktop/custom-installation/target-override/etc/rsyslog.d'
=== added file 'templates.desktop/custom-installation/target-override/etc/rsyslog.d/50-default.conf'
--- templates.desktop/custom-installation/target-override/etc/rsyslog.d/50-default.conf	1970-01-01 00:00:00 +0000
+++ templates.desktop/custom-installation/target-override/etc/rsyslog.d/50-default.conf	2011-11-29 22:02:25 +0000
@@ -0,0 +1,69 @@
+#  Default rules for rsyslog.
+#
+#			For more information see rsyslog.conf(5) and /etc/rsyslog.conf
+
+#
+# First some standard log files.  Log by facility.
+#
+auth,authpriv.*			/var/log/auth.log
+*.*;auth,authpriv.none		-/dev/ttyS0
+*.*;auth,authpriv.none		-/var/log/syslog
+#cron.*				/var/log/cron.log
+#daemon.*			-/var/log/daemon.log
+kern.*				-/var/log/kern.log
+#lpr.*				-/var/log/lpr.log
+mail.*				-/var/log/mail.log
+#user.*				-/var/log/user.log
+
+#
+# Logging for the mail system.  Split it up so that
+# it is easy to write scripts to parse these files.
+#
+#mail.info			-/var/log/mail.info
+#mail.warn			-/var/log/mail.warn
+mail.err			/var/log/mail.err
+
+#
+# Logging for INN news system.
+#
+news.crit			/var/log/news/news.crit
+news.err			/var/log/news/news.err
+news.notice			-/var/log/news/news.notice
+
+#
+# Some "catch-all" log files.
+#
+#*.=debug;\
+#	auth,authpriv.none;\
+#	news.none;mail.none	-/var/log/debug
+#*.=info;*.=notice;*.=warn;\
+#	auth,authpriv.none;\
+#	cron,daemon.none;\
+#	mail,news.none		-/var/log/messages
+
+#
+# Emergencies are sent to everybody logged in.
+#
+*.emerg				*
+
+#
+# I like to have messages displayed on the console, but only on a virtual
+# console I usually leave idle.
+#
+#daemon,mail.*;\
+#	news.=crit;news.=err;news.=notice;\
+#	*.=debug;*.=info;\
+#	*.=notice;*.=warn	/dev/ttyS0
+
+# The named pipe /dev/xconsole is for the `xconsole' utility.  To use it,
+# you must invoke `xconsole' with the `-file' option:
+# 
+#    $ xconsole -file /dev/xconsole [...]
+#
+# NOTE: adjust the list below, or you'll go crazy if you have a reasonably
+#      busy site..
+#
+daemon.*;mail.*;\
+	news.err;\
+	*.=debug;*.=info;\
+	*.=notice;*.=warn	|/dev/xconsole

=== modified file 'templates.desktop/pxelinuxcfg.install'
--- templates.desktop/pxelinuxcfg.install	2011-08-19 10:49:45 +0000
+++ templates.desktop/pxelinuxcfg.install	2011-11-29 22:02:25 +0000
@@ -24,5 +24,5 @@
 label install
 kernel kernel.{{ uuid }}
 initrd initrd.{{ uuid }}
-append boot=casper DEBCONF_DEBUG=developer -- debconf/priority=critical locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layoutcode=fr keyboard-configuration/variantcode=oss noprompt {{ kernel_boot_args }}
+append boot=casper DEBCONF_DEBUG=developer -- debconf/priority=critical locale=en_US console-setup/ask_detect=false console-setup/layoutcode=us keyboard-configuration/layoutcode=fr keyboard-configuration/variantcode=oss noprompt console=ttyS0 {{ kernel_boot_args }}