diff options
| author | Mario Izquierdo (mariodebian) <mariodebian@gmail.com> | 2008-04-20 14:30:00 +0000 |
|---|---|---|
| committer | Mario Izquierdo (mariodebian) <mariodebian@gmail.com> | 2008-04-20 14:30:00 +0000 |
| commit | d25baeb954fb36f598d5330c03825f61edaa8c00 (patch) | |
| tree | ce5abf676370ac361019e068fea2eac9f767057c | |
| parent | 91b087cc5a5495bb34e4453036c13548d6e635e0 (diff) | |
initramfs-tools-tcos (0.89~rc3)
* tcos/default.menu.tpl conf/base.conf conf/tcos-generation-
functions.sh
- Add TCOS_NETBOOT_HIDE_LOCAL
git-svn-id: http://tcosproject.org/svn/tcos/trunk/initramfs-tools-tcos@783 97557d6f-af72-4ac7-98cc-18709f36555f
| -rw-r--r-- | conf/base.conf | 3 | ||||
| -rw-r--r-- | conf/tcos-generation-functions.sh | 14 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | tcos/default.menu.tpl | 7 |
4 files changed, 26 insertions, 3 deletions
diff --git a/conf/base.conf b/conf/base.conf index 4f70291..67252b3 100644 --- a/conf/base.conf +++ b/conf/base.conf @@ -12,6 +12,9 @@ TCOS_NETBOOT_MENU_VESA=1 # Hide install and update options (set to empty to show options) TCOS_NETBOOT_HIDE_INSTALL=1 +# hide local HDD boot +TCOS_NETBOOT_HIDE_LOCAL=1 + # kernel cmdline ( needed for nbi images) TCOS_APPEND="ramdisk_size=65536 initrd=initramfs-${TCOS_KERNEL} root=/dev/ram boot=tcos quiet splash" diff --git a/conf/tcos-generation-functions.sh b/conf/tcos-generation-functions.sh index c907ddc..f3f7233 100644 --- a/conf/tcos-generation-functions.sh +++ b/conf/tcos-generation-functions.sh @@ -228,8 +228,10 @@ force_add_module() { function parse_pxelinuxcfg(){ if [ $TCOS_NETBOOT_MENU ]; then TEMPLATE=${TCOS_CONF}/pxelinux.menu.cfg.tpl + _verbose "(t-g-f) BOOT_MENU=1" else TEMPLATE=${TCOS_CONF}/pxelinux.cfg.tpl + _verbose "(t-g-f) BOOT_MENU=0" fi if [ $TCOS_NETBOOT_MENU_VESA ]; then @@ -244,18 +246,26 @@ function parse_pxelinuxcfg(){ TCOS_NETBOOT_HIDE_INSTALL_STRING="#" fi + if [ $TCOS_NETBOOT_HIDE_LOCAL ]; then + TCOS_NETBOOT_HIDE_LOCAL_STRING="" + else + TCOS_NETBOOT_HIDE_LOCAL_STRING="#" + fi + if [ "$1" != "" ]; then DESTFILE=$1 else DESTFILE=${TFTP_DIR}/pxelinux.cfg/default fi - echo "## Generated file don't edit, edit $TEMPLATE instead" > ${DESTFILE} + echo "## Generated file don't edit, edit $TEMPLATE instead" > ${DESTFILE} echo "## File generated by gentcos on $(date)" >> ${DESTFILE} sed -e "s/__TCOS_KERNEL__/${TCOS_KERNEL}/g"\ -e "s/__DATE__/$(date)/g" \ -e "s/__TCOS_MENU_TYPE__/${TCOS_MENU_TYPE}/g" \ - -e "s/__TCOS_MENU_HIDE_INSTALL__/${TCOS_NETBOOT_HIDE_INSTALL_STRING}/g" \ + -e "s/__TCOS_NETBOOT_HIDE_INSTALL__/${TCOS_NETBOOT_HIDE_INSTALL_STRING}/g" \ + -e "s/__TCOS_NETBOOT_HIDE_LOCAL__/${TCOS_NETBOOT_HIDE_LOCAL_STRING}/g" \ -e "s/__TCOS_MENU_PASSWD__/${TCOS_ROOT_PASSWD}/g" \ -e "s/__TFTP_MSG__/${TFTP_MSG}/g" ${TEMPLATE} >> ${DESTFILE} + _verbose "(t-g-f) MENU_FILE=$(cat ${DESTFILE})" } diff --git a/debian/changelog b/debian/changelog index edead97..974673d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,11 @@ initramfs-tools-tcos (0.89~rc3) unstable; urgency=low - warn about lost TCOS_BASE_TEMPLATE var in tcosconfig.conf * hooks-addons/50xorg - Disable dpms when starting Xorg (thanks to Santiago Castillo) + * tcos/default.menu.tpl conf/base.conf conf/tcos-generation- + functions.sh + - Add TCOS_NETBOOT_HIDE_LOCAL - -- Mario Izquierdo (mariodebian) <mariodebian@gmail.com> Thu, 17 Apr 2008 14:49:23 +0200 + -- Mario Izquierdo (mariodebian) <mariodebian@gmail.com> Sun, 20 Apr 2008 16:28:32 +0200 initramfs-tools-tcos (0.89~rc2) unstable; urgency=low diff --git a/tcos/default.menu.tpl b/tcos/default.menu.tpl index e5df669..3cb15b4 100644 --- a/tcos/default.menu.tpl +++ b/tcos/default.menu.tpl @@ -21,6 +21,13 @@ label nfs KERNEL vmlinuz-__TCOS_KERNEL__ APPEND ramdisk_size=32768 initrd=initramfs-__TCOS_KERNEL__ root=/dev/ram0 boot=tcos quiet splash +label local + __TCOS_NETBOOT_HIDE_LOCAL__MENU HIDE + MENU LABEL LOCAL ( boot from ^local HDD) + KERNEL chain.c32 + APPEND hd0 0 + + label install __TCOS_NETBOOT_HIDE_INSTALL__MENU HIDE MENU LABEL TCOS ( ^install images on HDD) |