Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove references to update_revision and fix generate_live_config() #218

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove references to update_revision and fix generate_live_config() #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b63373
Remove references to update_revision
matthijskooijman Jun 5, 2015
2bab5bb
Update kernel flavour list in generate_live_config()
matthijskooijman Jun 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion etc/webc/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
Expand Down
11 changes: 2 additions & 9 deletions etc/webc/upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down