diff options
author | Matthias Hentges <oe@hentges.net> | 2006-11-20 17:32:07 +0000 |
---|---|---|
committer | Matthias Hentges <oe@hentges.net> | 2006-11-20 17:32:07 +0000 |
commit | 3228ab044f30bc93da486c6236d3d8818eedc845 (patch) | |
tree | 6a42ab69078526f382bf1b605269e98fe7cda232 /packages/altboot/files/altboot-menu/Advanced | |
parent | 57331d6604ba8cb8f1cea88113667fbd02e84a83 (diff) | |
parent | 6dbc26661f6dc3c1d468be596b52a9b2a52c9b96 (diff) |
merge of '6219faf600ddbd4c2c3b44a157a842316dfa00d8'
and '87fdd2d36ae67f50ee78c7ecd82a94682bcfe372'
Diffstat (limited to 'packages/altboot/files/altboot-menu/Advanced')
-rw-r--r-- | packages/altboot/files/altboot-menu/Advanced/40-bootNFS | 2 | ||||
-rw-r--r-- | packages/altboot/files/altboot-menu/Advanced/55-bin-sh | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index 87373d8eec..4f5c195be2 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -9,6 +9,8 @@ M_TITLE="Boot from NFS" +test "$DISABLE_NFS_BOOT" = yes && exit 0 + # This function is activated by init.altboot by calling this script with the "run" option run_module() { diff --git a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh b/packages/altboot/files/altboot-menu/Advanced/55-bin-sh index 4619e51ce7..6c9aef3f3e 100644 --- a/packages/altboot/files/altboot-menu/Advanced/55-bin-sh +++ b/packages/altboot/files/altboot-menu/Advanced/55-bin-sh @@ -1,6 +1,7 @@ # !/bin/sh M_TITLE="init=/bin/sh" +test "$DISABLE_BINSH_BOOT" = yes && exit 0 run_module() { |