From: grml User Date: Sat, 15 Sep 2007 16:37:56 +0000 (+0200) Subject: Make grml-live script usable, update docs and config files X-Git-Tag: 0.0.1~68 X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=e185d67c5e91b61274aa84575dd4d4243005ff95 Make grml-live script usable, update docs and config files --- diff --git a/docs/grml-live.txt b/docs/grml-live.txt index 33466b3..bc5e67f 100644 --- a/docs/grml-live.txt +++ b/docs/grml-live.txt @@ -37,12 +37,9 @@ How to get your own live-cd - the easy, fast and simple way To get a small, Debian-stable and grml based live-cd: - # export LANG=C ; export LC_MESSAGES=C # TARGET="/grml/chroot/grml_uncompressed" # CDDIR="/grml/chroot/grml_cd" - # mkdir -p $TARGET - - # fai -v -C /etc/grml/fai -cGRML dirinstall $TARGET + # grml-live -c GRML -t $TARGET # mksquashfs $TARGET/* $CDDIR/live/grml.squashfs -noappend # cd $CDDIR # mkisofs -V "my personal grml" -l -r -J -no-emul-boot -boot-load-size 4 \ @@ -64,6 +61,11 @@ like check out /usr/share/doc/fai-doc/examples/simple/ (provided by Debian packa fai-doc). /usr/share/doc/fai-doc/fai-guide.html/ch-config.html also provides documentation regarding configuration possibilities. + /usr/sbin/grml-live + +Script for the main build process (being a wrapper around FAI currently). +Requires root permissions for execution. + /etc/grml/fai/fai.conf Main configuration file which specifies where all the configuration files and @@ -128,11 +130,8 @@ live-initramfs(8). TODO ---- -* provide a wrapper script which runs all the necessary command in a single run -(named grml-live plus configuration file /etc/grml/grml-live.conf) - -* replace 192.168.... inside the configuration files for the Debian mirro with -something generic and make it configurable +* provide a wrapper script which runs all the necessary command in a single run (/usr/sbin/grml-live and +/etc/grml/grml-live.conf are work in progress) * provide buildprocess for boot/isolinux stuff diff --git a/etc/grml/fai/apt/sources.list b/etc/grml/fai/apt/sources.list index dca1d99..4bf5efd 100644 --- a/etc/grml/fai/apt/sources.list +++ b/etc/grml/fai/apt/sources.list @@ -1,11 +1,3 @@ -# These lines should work for many sites -# A more comprehensive example is at /usr/share/doc/fai-doc/examples/etc - -deb http://192.168.1.112/debian etch main contrib non-free deb http://deb.grml.org/ grml-stable main deb http://deb.grml.org/ grml-testing main deb http://ftp.de.debian.org/debian etch main contrib non-free - -# deb http://www.informatik.uni-koeln.de/fai/download etch koeln -# deb http://ftp.debian.org/debian etch-proposed-updates main contrib non-free -# deb http://security.debian.org/debian-security etch/updates main contrib non-free diff --git a/etc/grml/fai/make-fai-nfsroot.conf b/etc/grml/fai/make-fai-nfsroot.conf index e4a6e09..5226d6f 100644 --- a/etc/grml/fai/make-fai-nfsroot.conf +++ b/etc/grml/fai/make-fai-nfsroot.conf @@ -12,8 +12,7 @@ TFTPROOT=/srv/tftp/fai # on the clients. This line(s) will be added to $nfsroot/etc/hosts. #NFSROOT_ETC_HOSTS="192.168.1.250 yourinstallserver" -FAI_DEBOOTSTRAP="etch http://192.168.1.102/debian" -#FAI_DEBOOTSTRAP="etch http://ftp.de.debian.org/debian" +FAI_DEBOOTSTRAP="etch http://ftp.de.debian.org/debian" # the encrypted (with md5 or crypt) root password on all install clients during # installation process; used when log in via ssh; default pw is: fai diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf index 02feb1d..816c7aa 100644 --- a/etc/grml/grml-live.conf +++ b/etc/grml/grml-live.conf @@ -30,4 +30,21 @@ USERNAME=grml # do you want to pass any additional arguments to FAI? FAI_ARGS="" +# do you want to generate /etc/grml/fai/apt/sources.list via grml-live? +# otherwise just take what /etc/grml/fai/apt/sources.list provides by default +# GRML_LIVE_SOURCES=" +#deb http://192.168.1.112/debian etch main contrib non-free +#deb http://deb.grml.org/ grml-stable main +#deb http://deb.grml.org/ grml-testing main +#deb http://ftp.de.debian.org/debian etch main contrib non-free +#" + +# Which Debian flavour and which mirror do you want to use for debootstrapping? +# Unless specified the default from /etc/grml/fai/make-fai-nfsroot.conf will be +# taken. If you specify a value then the file +# /etc/grml/fai/make-fai-nfsroot.conf will be updated by grml-live on the fly. +# usage: +# FAI_DEBOOTSTRAP="etch http://ftp.de.debian.org/debian" + + ## END OF FILE ################################################################# diff --git a/grml-live b/grml-live index 2ecba76..efaea44 100755 --- a/grml-live +++ b/grml-live @@ -20,7 +20,7 @@ fi VERBOSE='' FORCE='' -DEBUG='' +DEBUG='' # TODO / FIXME - not implemented yet # source main configuration file: . /etc/grml/grml-live.conf @@ -121,8 +121,16 @@ if [ -z "$FORCE" ] ; then fi # }}} +if [ -n "$GRML_LIVE_SOURCES" ] ; then + echo $GRML_LIVE_SOURCES > /etc/grml/fai/apt/sources.list +fi + +if [ -n "$FAI_DEBOOTSTRAP" ] ; then + sed -i "s#^FAI_DEBOOTSTRAP#FAI_DEBOOTSTRAP=$FAI_DEBOOTSTRAP#" /etc/grml/fai/make-fai-nfsroot.conf +fi + # execute FAI {{{ -echo fai -v -C "$FAI_CONFIG" -c"$CLASSES" dirinstall "$TARGET" $FAI_ARGS +fai -v -C "$FAI_CONFIG" -c"$CLASSES" dirinstall "$TARGET" $FAI_ARGS # }}} ## END OF FILE #################################################################