[Lunar-commits] <lunar-iso> Added parts missing to the installer.

[Peter de Ridder]

commit 24eb297b80ae9221fdf41792e59a8fa12ce59840
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Thu, 15 Aug 2013 23:27:13 -0700
URL: https://github.com/lunar-linux/lunar-iso/commit/24eb297b80ae9221fdf41792e59a8fa12ce59840

Added parts missing to the installer.
---
  isolinux/isolinux.cfg.i686       | +3/-9     
  isolinux/isolinux.cfg.x86_64     | +3/-9     
  livecd/template/etc/issue        | +3/-0     
  livecd/template/etc/issue.net    | +3/-0     
  lunar-install/sbin/lunar-install | +6/-3     
  mkfiles/iso.mk                   | +1/-1     
  template/var/state/lunar/depends | +0/-1     
  7 files changed, 19 insertions(+), 23 deletions(-)

--- a/isolinux/isolinux.cfg.i686
+++ b/isolinux/isolinux.cfg.i686
@@ -1,5 +1,5 @@
 DEFAULT install
-APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10
+APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10 loglevel=3
 DISPLAY f1.txt
 TIMEOUT 600
 PROMPT 1
@@ -14,16 +14,10 @@ F8 f1.txt
 F9 f1.txt
 LABEL install
 	KERNEL linux
-	APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10 vga=ask
+	APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10 loglevel=3 vga=ask
 LABEL novga
 	KERNEL linux
-	APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10 nomodeset
-LABEL linux
-	KERNEL linux
-	APPEND read-only load_ramdisk=1 ramdisk_size=INITRDSIZE initrd=initrd root=/dev/ram0 prompt_ramdisk=0 vga=ask
-LABEL safe
-	KERNEL safe
-	APPEND read-only load_ramdisk=1 ramdisk_size=INITRDSIZE initrd=initrd root=/dev/ram0 prompt_ramdisk=0 vga=normal acpi=off apm=off noapic noisapnp nosmp notsc
+	APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10 loglevel=3 nomodeset
 LABEL memtest
 	KERNEL memtest
 	APPEND -
--- a/isolinux/isolinux.cfg.x86_64
+++ b/isolinux/isolinux.cfg.x86_64
@@ -1,5 +1,5 @@
 DEFAULT install
-APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10
+APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10 loglevel=3
 DISPLAY f1.txt
 TIMEOUT 600
 PROMPT 1
@@ -14,15 +14,9 @@ F8 f1.txt
 F9 f1.txt
 LABEL install
 	KERNEL linux
-	APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10 vga=ask
+	APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10 loglevel=3 vga=ask
 LABEL novga
 	KERNEL linux
-	APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10 nomodeset
-LABEL linux
-	KERNEL linux
-	APPEND read-only load_ramdisk=1 ramdisk_size=INITRDSIZE initrd=initrd root=/dev/ram0 prompt_ramdisk=0 vga=ask
-LABEL safe
-	KERNEL safe
-	APPEND read-only load_ramdisk=1 ramdisk_size=INITRDSIZE initrd=initrd root=/dev/ram0 prompt_ramdisk=0 vga=normal acpi=off apm=off noapic noisapnp nosmp notsc
+	APPEND ro initrd=initrd root=LABEL=%LABEL% readonlyroot rootdelay=10 loglevel=3 nomodeset
 # uncomment the following line to enable serial console booting
 # SERIAL 0 38400
--- /dev/null
+++ b/livecd/template/etc/issue
@@ -0,0 +1,3 @@
+Lunar Linux %VERSION% (%CODENAME% - %DATE%)
+Kernel \r on an \m
+
--- /dev/null
+++ b/livecd/template/etc/issue.net
@@ -0,0 +1,3 @@
+Lunar Linux %VERSION% (%CODENAME% - %DATE%)
+Kernel \r on an \m
+
--- a/lunar-install/sbin/lunar-install
+++ b/lunar-install/sbin/lunar-install
@@ -1126,9 +1126,8 @@ transfer()
 
 			# pass through some of the configuration at this point:
 			percent_msg "Finishing up installation"
-			[ -z "$KEYMAP" ] || echo "$KEYMAP" > $TARGET/etc/keymap
-			[ -z "$CONSOLEFONT" ] || echo "$CONSOLEFONT" > $TARGET/etc/consolefont
-			[ -z "$LANG" ] || echo -e "# you can add declarations for LC_ALL etc in here\n\nexport LANG=\"$LANG\"\n" > $TARGET/etc/LOCALE
+			echo -e "KEYMAP=$KEYMAP\nFONT=$CONSOLEFONT" > $TARGET/etc/vconsole.conf
+			[ -z "$LANG" ] || chroot_run localectl --no-ask-password set-locale "$LANG"
 			[ -z "$EDITOR" ] || echo "export EDITOR=\"$EDITOR\"" > $TARGET/etc/profile.d/editor.rc
 
 			# post-first-boot message:
@@ -1162,10 +1161,14 @@ transfer()
 			# some more missing files:
 			#cp /etc/lunar.release $TARGET/etc/
 			cp /etc/lsb-release $TARGET/etc/
+			cp /etc/issue{,.net} $TARGET/etc/
 
 			echo "    LUNAR_MODULE=lunar" > $TARGET/etc/lunar/local/config
 			#cp /etc/lunar/local/.config* $TARGET/etc/lunar/local/
 
+			# root user skel files
+			find $TARGET/etc/skel ! -type d | xargs -i cp '{}' $TARGET/root
+
 			# initialize the new machine:
 			touch $TARGET/var/log/{btmp,utmp,wtmp,lastlog}
 			chmod 0644 $TARGET/var/log/{utmp,wtmp,lastlog}
--- a/mkfiles/iso.mk
+++ b/mkfiles/iso.mk
@@ -30,7 +30,7 @@ iso-modules: $(ISO_TARGET)/.iso-modules
 
 
 # Prepare target files
-ISO_ETC_FILES=lsb-release fstab motd
+ISO_ETC_FILES=lsb-release fstab motd issue issue.net
 
 $(ISO_TARGET)/etc/%: $(ISO_SOURCE)/livecd/template/etc/% iso-modules
 	@sed -e 's:%VERSION%:$(ISO_VERSION):g' -e 's:%CODENAME%:$(ISO_CODENAME):g' -e 's:%DATE%:$(ISO_DATE):g' -e 's:%KERNEL%:$(ISO_KERNEL):g' -e 's:%CNAME%:$(ISO_CNAME):g' -e 's:%COPYRIGHTYEAR%:$(ISO_COPYRIGHTYEAR):g' -e 's:%LABEL%:$(ISO_LABEL):' $< > $@
--- a/template/var/state/lunar/depends
+++ b/template/var/state/lunar/depends
@@ -1,3 +1,2 @@
 irssi:perl:off:optional::--without-perl
 tar:pbzip2:off:optional:--with-bzip2=/usr/bin/pbzip2:
-systemd:docbook-xsl:off:optional:--enable-manpages:--disable-manpages