From 3b633738a3bde511b923fa161aee07ae4c322e79 Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Fri, 5 Jun 2015 14:18:45 +0200 Subject: [PATCH 1/2] Remove references to update_revision This variable / option was no longer used, but it was stil defined and there were still some comments talking about it. --- etc/webc/upgrade.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/etc/webc/upgrade.sh b/etc/webc/upgrade.sh index af11d19dbd..940c5a8cfb 100755 --- a/etc/webc/upgrade.sh +++ b/etc/webc/upgrade.sh @@ -16,18 +16,13 @@ fi # the revision we should fetch from the git server (it # can only be a branch or tag name, since we can't fetch # a sha directly). -# update_revision is optional and can be used to specify -# a sha of a revision to update to (but it must be -# "included" in the fetch triggered by fetch_revision). -# If no update_revision is given, the revision specified -# by fetch_revision is used. # -# Note that there is a third revision parameter, +# Note that there is a second revision parameter, # git_revision, which must always contain a sha and must # only be used on the real kernel cmdline in the # bootloader config to tell the initrd which revision to # mount. It is automatically generated below based on -# fetch_revision / update_revision. +# fetch_revision. if cmdline_has fetch-revision then @@ -36,8 +31,6 @@ else fetch_revision=master fi -update_revision=$(cmdline_get update-revision) - logs "Fetching git revision ${fetch_revision}" # Fetch the git revision. It will not be stored From 2bab5bba1b88a9fc8acf52ef0c799da48fcaf4a6 Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Fri, 5 Jun 2015 14:50:30 +0200 Subject: [PATCH 2/2] Update kernel flavour list in generate_live_config() This function isn't used with regular Webconverger images, but allows upgrading of live hdd images without installing. Since the 486 kernel is no longer available, no bootloader menu option should be generated for it. --- etc/webc/functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/webc/functions.sh b/etc/webc/functions.sh index 91cb1d9325..a0f2d18ef8 100755 --- a/etc/webc/functions.sh +++ b/etc/webc/functions.sh @@ -160,7 +160,7 @@ generate_live_config() local bootparams=$(get_bootparams "$git_repo" "$git_revision") # TODO: Unhardcode this list - local flavours="486 686-pae" + local flavours="686-pae" if ! [ -r "${dir}/boot/live.cfg.in" ]; then logs "live.cfg.in not found, skipping bootloader update!"