Merge branch 'master' into buildhauer

Conflicts:
	scripts/mount-stick-repo.sh

scripts/liprepoctl.sh

@@ -3,8 +3,8 @@
 ACTION="$1"
 FILENAME="/etc/apt/sources.list.d/lipoffline.list"
 ACTIVATED=`test -e "$FILENAME"`
-DIST_CODENAME="saucy"
-DIST_VERSION="13.10"
+DIST_CODENAME="trusty"
+DIST_VERSION="14.04"
 
 
 function install_repo()

scripts/mount-stick-repo.sh

@@ -44,11 +44,11 @@ else
   echo "Stick gefunden als $DEV"
 
   # ask udisks to mount it always.
-  udisksctl mount --block-device "$DEV"
+  udisksctl mount --block-device "$DEV" || true
 
   # see where it is mounted
   DEVFILE=${DEV#/dev/}
-  MPOINT="$(dbus-send --print-reply=literal --system --dest=org.freedesktop.UDisks /org/freedesktop/UDisks/devices/${DEVFILE} org.freedesktop.DBus.Properties.Get string:'org.freedesktop.UDisks.Device' string:'DeviceMountPaths' | tail -n +2 | tr -d "\ \]\[" | head -n 1)"
+  MPOINT="$(dbus-send --print-reply=literal --system --dest=org.freedesktop.UDisks2 /org/freedesktop/UDisks2/block_devices/${DEVFILE} org.freedesktop.DBus.Properties.Get string:'org.freedesktop.UDisks2.Filesystem' string:'MountPoints' | tail -n +3 | tr -d "\ \]\[" | head -n 1 | xxd -r -p)"
 
   echo "Der Stick it als '$MPOINT' gemountet"
 fi

win/custom.cfg

+# Taken from https://github.com/GAireg/grubconfig/blob/master/grub.cfg
+# load windows from efi
+menuentry "Windows EFI" {
+	search --file --set dev_root --no-floppy /EFI/Microsoft/boot/bootmgfw.efi
+	chainloader ($dev_root)/EFI/Microsoft/boot/bootmgfw.efi
+}
\ No newline at end of file