Skip to content

Commit

Permalink
Fixes #107 to disallow breaking install boot
Browse files Browse the repository at this point in the history
  • Loading branch information
@kaihendry
kaihendry committed Nov 28, 2012
1 parent c3e1081 commit 9b47bee
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions etc/webc/functions.sh
View file
Expand Up @@ -192,20 +192,18 @@ generate_installed_config()
# Extract the kernel and initrd from git
extract_kernel "${dir}/live" "${flavour}" "" "${git_repo}" "${git_revision}" || return 1

cmdline_has noescape && noescape="noescape 1"

# Generate global extlinux config file
cat<<EOF > ${dir}/boot/extlinux/extlinux.conf
default linux
prompt 0
include linux.cfg
EOF

# Generate config entry to boot our selected flavour
cat<<EOF > ${dir}/boot/extlinux/linux.cfg
${noescape}
label linux
linux /live/vmlinuz
append initrd=/live/initrd.img ${bootparams}
linux /live/vmlinuz
append initrd=/live/initrd.img ${bootparams}

This comment has been minimized.

Sign in to view

Copy link
@matthijskooijman

matthijskooijman Nov 28, 2012

Member

Why did these spaces have to go? IMHO they add value and removing them clutters the commit.

This comment has been minimized.

Sign in to view

Copy link
@kaihendry

kaihendry Nov 28, 2012

Author Member

you mean the tabs?

This comment has been minimized.

Sign in to view

Copy link
@matthijskooijman

matthijskooijman Nov 28, 2012

Member

Possibly, the leading indent in linux and append lines. Github is only shown two positions of indent, which didn't make me realize there was a tab involved :-)

This comment has been minimized.

Sign in to view

Copy link
@kaihendry

kaihendry Nov 28, 2012

Author Member

I removed them I guess. I think it looks ok:

webc/etc/webc/functions.sh

Line 198 in 9b47bee

cat<<EOF > ${dir}/boot/extlinux/extlinux.conf

The append line as we can see here is pretty darn wide http://imgur.com/WqOQc

It's not worth re-doing for some whitespace, is it? :)

I was wondering if one get git rid of the default and label lines. didn't take the time to test.

This comment has been minimized.

Sign in to view

Copy link
@matthijskooijman

matthijskooijman Nov 28, 2012

Member

It's fairly trivial to re-add the spaces with commit --amend or rebase, of course (and IMHO they add a bit of clarity to the structure of the file, but with just a single entry, it's not very important). Feel free to leave it at this, I know I am a nitpick for these things ;-p
EOF

}

# vim: set sw=8 sts=8 noexpandtab:

0 comments on commit 9b47bee

Please sign in to comment.