[Lunar-commits] <lunar-iso> Adding files to be able to boot the iso

[Peter de Ridder]

commit e51d2263e2f08665a8fe5dfbc17453da402e634f
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Mon, 19 Nov 2012 08:16:37 -0800
URL: https://github.com/lunar-linux/lunar-iso/commit/e51d2263e2f08665a8fe5dfbc17453da402e634f

Adding files to be able to boot the iso
---
  conf/modules.iso          | +1/-1     
  livecd/template/etc/fstab | +7/-0     
  mkfiles/bootstrap.mk      | +2/-1     
  mkfiles/iso.mk            | +4/-1     
  mkfiles/stage2.mk         | +2/-1     
  5 files changed, 16 insertions(+), 4 deletions(-)

--- a/conf/modules.iso
+++ b/conf/modules.iso
@@ -1 +1 @@
-ISO_MODULES=acl attr bash binutils btrfs-progs bzip2 coreutils cracklib dbus dhcpcd dialog diffutils dmidecode dosfstools dracut e2fsprogs e3 ed file findutils gawk gcc glib-2 glibc gpm grep grub grub2 gzip installwatch irssi jfsutils joe kernel-headers kmod less libcap libffi libmpc libtool lilo Linux-PAM lunar lvm2 m4 make mdadm memtest86+ mpfr nano ncurses net-tools netcat ntfsprogs openssh openssl parted patch pcre perl procps readline sed shadow syslinux systemd systemd-sysv tar timezone-date util-linux vim wget which xfsprogs xz zile zlib
+ISO_MODULES=acl attr bash binutils btrfs-progs bzip2 coreutils cracklib dbus dhcpcd dialog diffutils dmidecode dosfstools dracut e2fsprogs e3 ed expat file findutils gawk gcc glib-2 glibc gpm grep grub grub2 gzip installwatch irssi jfsutils joe kernel-headers kmod less libcap libffi libmpc libtool lilo Linux-PAM lunar lvm2 m4 make mdadm memtest86+ mpfr nano ncurses net-tools netcat ntfsprogs openssh openssl parted patch pcre perl procps readline sed shadow syslinux systemd systemd-sysv tar timezone-date util-linux vim wget which xfsprogs xz zile zlib
--- /dev/null
+++ b/livecd/template/etc/fstab
@@ -0,0 +1,7 @@
+# /etc/fstab: static file system information.
+# <file system> <mount point> <type> <options> <dump> <pass>
+
+tmpfs	/var/log	tmpfs	size=4m	0	0
+tmpfs	/var/tmp	tmpfs	size=4m	0	0
+#tmpfs	/var/cache/man	tmpfs	size=4m	0	0
+
--- a/mkfiles/bootstrap.mk
+++ b/mkfiles/bootstrap.mk
@@ -17,13 +17,14 @@ target: $(ISO_TARGET)/.target
 # fill the target with the base file required
 $(ISO_TARGET)/.base: target
 	@echo bootstrap-base
-	@mkdir -p $(ISO_TARGET)/{boot,bin,dev,etc,lib,mnt,proc,root,run,sbin,sys,tmp,usr,var} $(ISO_TARGET)/run/lock $(ISO_TARGET)/usr/{bin,include,lib,libexec,sbin,src,share} $(ISO_TARGET)/var/{cache,empty,lib,log,spool,state,tmp}
+	@mkdir -p $(ISO_TARGET)/{boot,bin,dev,etc,lib,mnt,proc,root,run,sbin,sys,tmp,usr,var} $(ISO_TARGET)/run/lock $(ISO_TARGET)/usr/{bin,include,lib,libexec,sbin,src,share} $(ISO_TARGET)/var/{cache,empty,lib,log,spool,state,tmp} $(ISO_TARGET)/var/cache/man
 	@ln -sf lib $(ISO_TARGET)/lib32
 	@ln -sf lib $(ISO_TARGET)/lib64
 	@ln -sf lib $(ISO_TARGET)/usr/lib32
 	@ln -sf lib $(ISO_TARGET)/usr/lib64
 	@ln -sf ../run/lock $(ISO_TARGET)/var/lock
 	@ln -sf ../run $(ISO_TARGET)/var/run
+	@ln -sf ../proc/self/mounts $(ISO_TARGET)/etc/mtab
 	@cp -r $(ISO_SOURCE)/template/etc $(ISO_TARGET)
 	@echo MAKES=$(ISO_MAKES) > $(ISO_TARGET)/etc/lunar/local/optimizations.GNU_MAKE
 	@touch $@
--- a/mkfiles/iso.mk
+++ b/mkfiles/iso.mk
@@ -35,7 +35,10 @@ $(ISO_TARGET)/etc/lsb-release: iso-modules
 	  echo 'DISTRIB_CODENAME="$(ISO_CODENAME)"' ; \
 	  echo 'DISTRIB_DESCRIPTION="Lunar Linux $(ISO_CNAME)"' ; } > $@
 
-iso-files: $(ISO_TARGET)/etc/lsb-release
+$(ISO_TARGET)/etc/fstab: $(ISO_SOURCE)/livecd/template/etc/fstab iso-modules
+	@cp $< $@
+
+iso-files: $(ISO_TARGET)/etc/lsb-release $(ISO_TARGET)/etc/fstab
 
 
 # Copy the isolinux files to the target
--- a/mkfiles/stage2.mk
+++ b/mkfiles/stage2.mk
@@ -18,13 +18,14 @@ stage2-target: $(ISO_TARGET)/.stage2-target
 # create base directory structure
 $(ISO_TARGET)/.stage2-base: stage2-target
 	@echo stage2-base
-	@mkdir -p $(ISO_TARGET)/{boot,bin,dev,etc,lib,mnt,proc,root,run,sbin,sys,tmp,usr,var} $(ISO_TARGET)/run/lock $(ISO_TARGET)/usr/{bin,include,lib,libexec,sbin,src,share} $(ISO_TARGET)/var/{cache,empty,lib,log,spool,state,tmp}
+	@mkdir -p $(ISO_TARGET)/{boot,bin,dev,etc,lib,mnt,proc,root,run,sbin,sys,tmp,usr,var} $(ISO_TARGET)/run/lock $(ISO_TARGET)/usr/{bin,include,lib,libexec,sbin,src,share} $(ISO_TARGET)/var/{cache,empty,lib,log,spool,state,tmp} $(ISO_TARGET)/var/cache/man
 	@ln -sf lib $(ISO_TARGET)/lib32
 	@ln -sf lib $(ISO_TARGET)/lib64
 	@ln -sf lib $(ISO_TARGET)/usr/lib32
 	@ln -sf lib $(ISO_TARGET)/usr/lib64
 	@ln -sf ../run/lock $(ISO_TARGET)/var/lock
 	@ln -sf ../run $(ISO_TARGET)/var/run
+	@ln -sf ../proc/self/mounts $(ISO_TARGET)/etc/mtab
 	@cp -r $(ISO_SOURCE)/template/etc $(ISO_TARGET)
 	@echo MAKES=$(ISO_MAKES) > $(ISO_TARGET)/etc/lunar/local/optimizations.GNU_MAKE
 	@touch $@