Commit 58a2c733 authored by Lars Beckers's avatar Lars Beckers

Merge branch 'master' of fsgit:lipstick

parents bf3f6c10 03125192
......@@ -51,6 +51,17 @@ fi
set gfxpayload=keep
#default values
set lip_flavor="Kubuntu"
set lip_version="14.04"
set lip_release="trusty"
set lip_extra_info=""
#if lipinfo.cfg exists use it to get better values for the lip_* variables.
if [ -f /grub/lipinfo.cfg ]; then
source /grub/lipinfo.cfg
fi
# Start a Debian style Casper Kernel
function LoadCasper {
echo "Loading kernel-${arch} (takes up to 2 minutes)"
......@@ -60,12 +71,12 @@ function LoadCasper {
echo "Starting kernel"
}
menuentry "Empfohlen: Kubuntu 14.04.1 ${bits}bit (deutsch)" {
menuentry "Empfohlen: ${lip_flavor} ${lip_version}${lip_extra_info} ${bits}bit (deutsch)" {
set cmdline="debian-installer/locale=de_DE console-setup/layoutcode=de"
LoadCasper
}
menuentry "Empfohlen: Kubuntu 14.04.1 ${bits}bit (english)" {
menuentry "Empfohlen: ${lip_flavor} ${lip_version}${lip_extra_info} ${bits}bit (english)" {
set cmdline=""
LoadCasper
}
......@@ -114,22 +125,22 @@ menuentry "Tool: 64bit GParted Live CD (laeuft im RAM -> mindestens 224MB)" {
echo "Starting 64 bit GParted kernel"
}
menuentry "Kubuntu 14.04.1 ${bits}bit (deutsch, failsafe)" {
menuentry "${lip_flavor} ${lip_version}${lip_extra_info} ${bits}bit (deutsch, failsafe)" {
set cmdline="debian-installer/locale=de_DE console-setup/layoutcode=de nomodeset noplymouth nosplash verbose text noacpi"
LoadCasper
}
menuentry "Kubuntu 14.04.1 ${bits}bit (english, failsafe)" {
menuentry "${lip_flavor} ${lip_version}${lip_extra_info} ${bits}bit (english, failsafe)" {
set cmdline="nomodeset noplymouth nosplash verbose text noacpi"
LoadCasper
}
menuentry "Kubuntu 14.04.1 ${bits}bit (deutsch, load casper from first disk)" {
menuentry "${lip_flavor} ${lip_version}${lip_extra_info} ${bits}bit (deutsch, load casper from first disk)" {
set cmdline="debian-installer/locale=de_DE console-setup/layoutcode=de live-media=/dev/sda1"
LoadCasper
}
menuentry "Kubuntu 14.04.1 ${bits}bit (english, load casper from first disk)" {
menuentry "${lip_flavor} ${lip_version}${lip_extra_info} ${bits}bit (english, load casper from first disk)" {
set cmdline="live-media=/dev/sda1"
LoadCasper
}
......
#!/bin/bash
BRANCH="ws14"
[ -e ".git" ] || exit 1
if [ ! -d ".git" ]; then
>&2 echo "Fatal error: expected .git directory in the working directory."
>&2 echo "Please make sure this script is executed in the root directory of the LIP Image."
exit 1
fi
[ -z "$1" ] || BRANCH="$1"
git pull
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment