From 5ced35281751f98b8c1a0c4d28f0653f7b3aabf2 Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Thu, 21 Aug 2014 14:35:50 -0300
Subject: [partitioner] made partitioner a config module

---
 .../partitioner/opt/openslx/scripts/partitioner    | 281 +++++++++++++++++++++
 1 file changed, 281 insertions(+)
 create mode 100755 server/modules/partitioner/opt/openslx/scripts/partitioner

(limited to 'server/modules')

diff --git a/server/modules/partitioner/opt/openslx/scripts/partitioner b/server/modules/partitioner/opt/openslx/scripts/partitioner
new file mode 100755
index 00000000..e5e94f4e
--- /dev/null
+++ b/server/modules/partitioner/opt/openslx/scripts/partitioner
@@ -0,0 +1,281 @@
+#!/bin/bash
+
+# set -e
+
+PARTITIONSPATH="/proc/partitions"
+CONFIGPATH="/opt/openslx/config"
+
+# BLOCKSIZE=$(sfdisk -l /dev/$CHOSENDISK | grep -o -e "blocks of [0-9]* bytes" | cut -d ' ' -f3)
+BLOCKSIZE=1024
+
+. $CONFIGPATH
+# testing if the sizes and ID's of the disk is defined in the config file
+
+
+# picking disk that will be used
+DISKS=$(cat $PARTITIONSPATH | tr -s ' ' | cut -d ' ' -f5 | grep -e "[a-z]$")
+if [ -z "$DISKS" ]; then
+  dialog --msgbox "ERROR: Can't find an hard disk." 10 40
+  exit 1
+fi
+if [ -z "$SLX_CHOOSEN_DISK" ]; then
+  DIALOGSTR="This computer has the following partitions:\n"
+  for disk in $DISKS; do
+    DISKSIZE=$(($(cat $PARTITIONSPATH | grep -e $disk$ | tr -s ' ' | cut -d ' ' -f4)*$BLOCKSIZE))
+    PARTS=$(cat $PARTITIONSPATH | grep -e $disk[0-9] | tr -s ' ' | cut -d ' ' -f5)
+    GBSIZE=$(echo "scale=2; $DISKSIZE/1024/1024/1024" | bc -l)
+    DIALOGSTR=$DIALOGSTR"$disk  $DISKSIZE Bytes ($GBSIZE GB)\n"
+    USED=0
+    for PART in $PARTS; do
+      PARTSIZE=$(($(cat $PARTITIONSPATH | grep -e $PART$ | tr -s ' ' | cut -d ' ' -f4)*1024))
+      USED=$(($USED+$PARTSIZE))
+      GBSIZE=$(echo "scale=2; $PARTSIZE/1024/1024/1024" | bc -l)
+      DIALOGSTR=$DIALOGSTR"   $PART   $PARTSIZE ($GBSIZE GB)\n"
+    done
+    DIALOGSTR=$DIALOGSTR"   ----------\n"
+    FREESPACE=$(($DISKSIZE-$USED))
+    GBSIZE=$(echo "scale=2; $USED/1024/1024/1024" | bc -l)
+    DIALOGSTR=$DIALOGSTR"   Used  $USED ($GBSIZE GB)\n"
+    GBSIZE=$(echo "scale=2; $FREESPACE/1024/1024/1024" | bc -l)
+    DIALOGSTR=$DIALOGSTR"   Free  $FREESPACE ($GBSIZE GB)\n\n"
+  done
+  if [ $(echo $DISKS | tr ' ' \\n | wc -l) -gt 1 ]; then
+    DIALOGSTR=$DIALOGSTR"Which of these disks you want to use?\n"
+    SLX_CHOOSEN_DISK=$(dialog --no-collapse --cr-wrap --inputbox "$DIALOGSTR" 0 0 $(echo $DISKS | cut -d ' ' -f1) 3>&1 1>&2 2>&3)
+    if [ $? -eq 1 ]; then
+      exit 1;
+    fi
+    # verify if the choosen disk is a valid disk
+    echo $DISKS | tr ' ' \\n | grep -e ^$SLX_CHOOSEN_DISK$ > /dev/null 2>/dev/null
+    while [ $? -ne 0 ]; do
+      dialog --msgbox "Invalid option.\nTry again." 0 0
+      SLX_CHOOSEN_DISK=$(dialog --no-collapse --cr-wrap --inputbox "$DIALOGSTR" 0 0 $(echo $DISKS | cut -d ' ' -f1) 3>&1 1>&2 2>&3)
+      if [ $? -eq 1 ]; then
+        exit 1;
+      fi
+      echo $DISKS | tr ' ' \\n | grep -e ^$SLX_CHOOSEN_DISK$ > /dev/null 2>/dev/null
+    done
+    # ask a confirmation (all your data will be lost etc)
+  elif [ $(echo $DISKS | tr ' ' \\n | wc -l) -eq 1 ]; then
+    SLX_CHOOSEN_DISK=$(echo $DISKS | tr ' ' \\n | head -n1)
+  else
+    dialog --msgbox "ERROR: Can't find an hard disk." 10 40
+    exit 1
+  fi
+fi
+# if SLX_PARTITION_TABLE is set then put his content in a associative array
+declare -A PARTTBL
+COUNTER=1
+if [ -n "$SLX_PARTITION_TABLE" ]; then
+  for PARTITION in $SLX_PARTITION_TABLE; do
+    IFS=,
+    set $PARTITION
+    if [ $COUNTER -eq 4 ]; then
+      COUNTER=$(($COUNTER+1))
+    fi
+    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/id"]=$1
+    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/size"]=$(echo $2 | egrep -o "[0-9]*")
+    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/mountpoint"]=$3
+    if [ -e $4 ]; then
+      PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=0
+    else
+      PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=1
+    fi
+    # set the partitions to non-existents
+    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/exists"]=0
+    COUNTER=$(($COUNTER+1))
+  done
+  unset IFS
+else
+    dialog --msgbox "ERROR: You didn't set a valid partition table. Please check your config file." 10 40
+    exit 1  
+fi
+# PARTTBL starts at 1 and ends at COUNTER-1
+
+# check if the choosen disk is greater than the new partition table size.
+DISKSIZE=$(($(cat $PARTITIONSPATH | grep -e $SLX_CHOOSEN_DISK$ | tr -s ' ' | cut -d ' ' -f4)*$BLOCKSIZE))
+NEEDED_SPACE=0
+for (( i = 1; i < $COUNTER; i++ )); do
+  if [[ $i -ne 4 ]]; then
+    NEEDED_SPACE=$(($NEEDED_SPACE+${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}))
+  fi
+done
+NEEDED_SPACE=$(($NEEDED_SPACE*1024*1024*1024+$COUNTER*1024*1024))
+echo "$DISKSIZE -lt $NEEDED_SPACE"
+if [ $DISKSIZE -lt $NEEDED_SPACE ]; then
+  dialog --msgbox "ERROR: Insufficient space in disk /dev/$SLX_CHOOSEN_DISK." 6 40
+  exit 1
+fi
+
+# choosing the partition type (MSDOS or GPT) if it wasn't set in config file
+if [ -z "$SLX_PARTITION_TYPE" ]; then
+  SLX_PARTITION_TYPE=msdos
+  ANS=$(dialog --no-tags --menu "Choose the partitions type" 0 0 0 "1" " MSDOS " "2" " GPT " 3>&1 1>&2 2>&3)
+  if [ $? -eq 1 ]; then
+    exit 1
+  fi
+  if [ $ANS -eq 1 ]; then
+    SLX_PARTITION_TYPE=msdos
+  else
+    SLX_PARTITION_TYPE=GPT
+  fi
+fi
+
+GBSIZE=$(echo "scale=2; $DISKSIZE/1024/1024/1024" | bc -l)
+DIALOGSTR="$SLX_CHOOSEN_DISK  $DISKSIZE Bytes ($GBSIZE GB)\n"
+PARTS=$(cat $PARTITIONSPATH | grep -e $SLX_CHOOSEN_DISK[0-9] | tr -s ' ' | cut -d ' ' -f5)
+USED=0
+for PART in $PARTS; do
+  PARTSIZE=$(($(cat $PARTITIONSPATH | grep -e $PART$ | tr -s ' ' | cut -d ' ' -f4)*$BLOCKSIZE))
+  USED=$(($USED+$PARTSIZE))
+  GBSIZE=$(echo "scale=2; $PARTSIZE/1024/1024/1024" | bc -l)
+  DIALOGSTR=$DIALOGSTR"   $PART   $PARTSIZE ($GBSIZE GB)\n"
+done
+DIALOGSTR=$DIALOGSTR"   ----------\n"
+FREESPACE=$(($DISKSIZE-$USED))
+GBSIZE=$(echo "scale=2; $USED/1024/1024/1024" | bc -l)
+DIALOGSTR=$DIALOGSTR"   Used  $USED ($GBSIZE GB)\n"
+GBSIZE=$(echo "scale=2; $FREESPACE/1024/1024/1024" | bc -l)
+DIALOGSTR=$DIALOGSTR"   Free  $FREESPACE ($GBSIZE GB)\n\n"
+DIALOGSTR=$DIALOGSTR"All /dev/$SLX_CHOOSEN_DISK partitions will be deleted, ok?"
+
+# asking confirmation to create the partitions
+if [[ $SLX_AUTOMATIC_PARTITIONING = "no" && SLX_DELETE_PARTITION_TABLE = 'yes' ]]; then
+  dialog --defaultno --yesno "$DIALOGSTR" 0 0
+  if [ $? -eq 1 ]; then
+    exit 1
+  fi
+fi
+
+# pick the size of a sector (usually 512 bytes)
+# SECTORSIZE=$(sfdisk /dev/$SLX_CHOOSEN_DISK -l -u S 2> /dev/null | grep Units | cut -d ' ' -f5)
+SECTORSIZE=512
+
+if [[ $USED -eq 0 ]]; then  
+  SLX_DELETE_PARTITION_TABLE="yes"
+fi
+
+if [ $SLX_DELETE_PARTITION_TABLE = "yes" ]; then
+  # delete partition table
+  sgdisk -Z /dev/$SLX_CHOOSEN_DISK > /dev/null 2> /dev/null # erase all partitions
+
+  # constructing the sfdisk input file
+  echo "unit: sectors
+  "> /tmp/partitiontable.tmp
+
+  START=$((1*1024*1024/$SECTORSIZE))
+  for (( i = 1; i < $COUNTER; i++ )); do
+    if [ $i -ne 4 ]; then
+      SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024/$SECTORSIZE))
+      ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
+      if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/bootable"]} -eq 1 ]; then
+        echo "/dev/"$SLX_CHOOSEN_DISK$i" : start= "$START", size= "$SIZE", Id= "$ID", bootable " >> /tmp/partitiontable.tmp
+      else
+        echo "/dev/"$SLX_CHOOSEN_DISK$i" : start= "$START", size= "$SIZE", Id= "$ID >> /tmp/partitiontable.tmp
+      fi
+      START=$(($START+$SIZE+1*1024*1024/$SECTORSIZE))
+    else
+      echo "/dev/"$SLX_CHOOSEN_DISK$i" : start= "$START", size= "$(($DISKSIZE/$SECTORSIZE-1))", Id= 5" >> /tmp/partitiontable.tmp
+      START=$(($START+1*1024*1024/$SECTORSIZE))
+    fi
+  done
+  sfdisk -q -f /dev/$SLX_CHOOSEN_DISK < /tmp/partitiontable.tmp > /dev/null
+  # rm -f /tmp/partitiontable.tmp
+elif [ $(sfdisk -d /dev/$SLX_CHOOSEN_DISK 2> /dev/null | grep $SLX_CHOOSEN_DISK'1' | tr -s ' ' | cut -d ' ' -f7 | cut -d '=' -f2) = 'ee' ]; then
+# finding existent partitions in GPT
+  echo 'GPT'
+  for PART in $PARTS; do
+    for (( i = 1; i < $COUNTER; i++ )); do
+      if [ $i -ne 4 ]; then
+        if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]} = 0 ]; then
+          sgdisk /dev/$SLX_CHOOSEN_DISK -i ${PART:3} | grep ${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}"000000-0000-0000-0000-000000000000" > /dev/null
+          if [ $? -eq 0 ]; then
+            echo "the partition $PART is the ${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]} partition."
+            PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]=$PART
+            NEEDED_SPACE=$(($NEEDED_SPACE-${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
+            break
+          fi
+        fi
+      fi
+    done
+  done
+  echo "FREESPACE="$FREESPACE
+  echo "NEEDED_SPACE="$NEEDED_SPACE  
+  if [[ $FREESPACE -lt $NEEDED_SPACE ]]; then
+    dialog --msgbox "ERROR: Insufficient free space in disk /dev/$SLX_CHOOSEN_DISK." 6 40
+    exit 1
+  fi
+else
+# finding existent partitions in MS-DOS
+  echo 'MSDOS'
+  for PART in $PARTS; do
+    for (( i = 1; i < $COUNTER; i++ )); do
+      if [ $i -ne 4 ]; then
+        if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]} = 0 ]; then
+          sfdisk -d /dev/$SLX_CHOOSEN_DISK 2> /dev/null | grep $PART | tr -s ' ' | cut -d ' ' -f7 | grep ${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]} > /dev/null
+          if [ $? -eq 0 ]; then
+            echo "the partition $PART is the ${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]} partition."
+            PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]=$PART
+            NEEDED_SPACE=$(($NEEDED_SPACE-${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
+            break
+          fi
+        fi
+      fi
+    done
+  done
+  echo "FREESPACE="$FREESPACE
+  echo "NEEDED_SPACE="$NEEDED_SPACE
+  if [[ $FREESPACE -lt $NEEDED_SPACE ]]; then
+    dialog --msgbox "ERROR: Insufficient free space in disk /dev/$SLX_CHOOSEN_DISK." 6 40
+    exit 1
+  fi
+fi
+
+DIALOGSTR="New partitions created:\n\n"
+if [ $SLX_PARTITION_TYPE = 'GPT' ]; then
+  # create the command (CMD) that will convert the MSDOS type to GPT and change the unique GUIDs
+  CMD="sgdisk -g /dev/$SLX_CHOOSEN_DISK"
+  for (( i = 1; i < $COUNTER; i++ )); do
+    if [ $i -ne 4 ]; then
+      if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]} = 0 ]; then
+        CMD=$CMD" -t "$i":"${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}"000000-0000-0000-0000-000000000000"
+      fi
+      CMD=$CMD" -c "$i":\""${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}"\""
+    fi
+  done
+  CMD=$CMD" > /dev/null"
+  $CMD
+
+  for (( i = 1; i < $COUNTER; i++ )); do
+    if [ $i -ne 4 ]; then
+      SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
+      ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
+      MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
+      DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"$SLX_CHOOSEN_DISK$i")\n"
+      DIALOGSTR=$DIALOGSTR"   GUID: "$ID"000000-0000-0000-0000-000000000000\n"
+      DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
+    fi
+  done
+else
+  for (( i = 1; i < $COUNTER; i++ )); do
+    if [ $i -lt 4 ]; then
+      SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
+      ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
+      MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
+      DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"$SLX_CHOOSEN_DISK$i")\n"
+      DIALOGSTR=$DIALOGSTR"   Type: Primary\n"
+      DIALOGSTR=$DIALOGSTR"   ID: "$ID"\n"
+      DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
+    elif [ $i -gt 4 ]; then
+      SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
+      ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
+      MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
+      DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"$SLX_CHOOSEN_DISK$i")\n"
+      DIALOGSTR=$DIALOGSTR"   Type: Logical\n"
+      DIALOGSTR=$DIALOGSTR"   ID: "$ID"\n"
+      DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
+    fi
+  done
+fi
+
+dialog --msgbox "$DIALOGSTR" 0 0
-- 
cgit v1.2.3-55-g7522


From 19600e53db2260b61a78af1d1e5e1d2c07dfa879 Mon Sep 17 00:00:00 2001
From: Lucas Affonso Xavier de Morais
Date: Thu, 21 Aug 2014 18:57:26 -0300
Subject: [partitioner] default statements implemented.

---
 .../opt/openslx/scripts/systemd-setup_partitions   | 83 ++++++++++------------
 .../partitioner/opt/openslx/scripts/partitioner    | 83 +++++++++++++---------
 2 files changed, 85 insertions(+), 81 deletions(-)

(limited to 'server/modules')

diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
index 17202418..748e017d 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
@@ -1,4 +1,4 @@
-#!/bin/ash
+#!/bin/bash
 # Copyright (c) 2013 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
@@ -13,12 +13,8 @@
 # detecting swap and special partitions
 
 #############################################################################
-
-# Mount point for persistent scratch partition (type 49 for BOOT, type48 for CACHE, type 47 for HOME)
-
-PERSISTENT_BOOT="/boot"	 
-PERSISTENT_CACHE="/cache"
-PERSISTENT_HOME="/home"
+CONFIGPATH="./config"
+. $CONFIGPATH
 
 # General formatter for the /tmp partition on a local harddisk
 diskfm () {
@@ -94,43 +90,49 @@ mount_temp_fallback () {
 
 mount_part() { # $1=mountpoint, $2=partition(/dev/*)
 	mkdir -p "$1"
-	if ! mount -t auto -o noexec "${2}" "$1"; then
+	if ! mount -t auto -o noexec "${2}" "$1" 2> /dev/null ; then
 		diskfm "$2" "jfs xfs ext3" || continue
 		mount -t auto -o noexec "${2}" "$1" || continue
 	fi
 	echo -e "${2}\t${1}\tauto\t\tnoauto,noexec\t\t 0 0" >> "/etc/fstab"
 }
 
+# default case
+if [ -z "$SLX_PARTITION_TABLE" ]; then
+	SLX_PARTITION_TABLE='			
+	44,10G,/tmp
+	45,10G,/var/scratch'
+fi
+
 declare -A PARTTBL
 COUNTER=1
-if [ -n "$SLX_PARTITION_TABLE" ]; then
-  for PARTITION in $SLX_PARTITION_TABLE; do
-    IFS=,
-    set $PARTITION
-    PARTTBL["$COUNTER/id"]=$1
-    PARTTBL["$COUNTER/size"]=$(echo $2 | egrep -o "[0-9]*")
-    PARTTBL["$COUNTER/mountpoint"]=$3
-    if [ -e $4 ]; then
-      PARTTBL["$COUNTER/bootable"]=0
-    else
-      PARTTBL["$COUNTER/bootable"]=1
-    fi
-    # set the partitions to non-existents
-    PARTTBL["$COUNTER/persistent"]="no"
-    COUNTER=$(($COUNTER+1))
-  done
-  unset IFS
-fi
+for PARTITION in $SLX_PARTITION_TABLE; do
+	IFS=,
+	set $PARTITION
+	PARTTBL["$COUNTER/id"]=$1
+	PARTTBL["$COUNTER/size"]=$(echo $2 | egrep -o "[0-9]*")
+	PARTTBL["$COUNTER/mountpoint"]=$3
+	if [ -e $4 ]; then
+	  PARTTBL["$COUNTER/bootable"]=0
+	else
+	  PARTTBL["$COUNTER/bootable"]=1
+	fi
+	PARTTBL["$COUNTER/persistent"]="no"
+	COUNTER=$(($COUNTER+1))
+done
+unset IFS
+
 
 # create the /etc/disk.partition file with all the partitions and respective id's (MSDOS and GPT)
+echo "PARTITION - ID" > "/etc/disk.partition"
 for hd in $(cat /proc/partitions | tr -s ' ' | cut -d ' ' -f5 | grep -o -e "[a-z]*$"); do
-	echo -n "$hd - " >> "/etc/disk.partition"
+	echo -n "$hd (" >> "/etc/disk.partition"
 	sfdisk -d /dev/$hd 2>&1 | grep 'GPT' > /dev/null
 	if [[ $? -eq 1 ]]; then
-		echo "MSDOS" >> "/etc/disk.partition"
-		fdisk /dev/$hd -l | sed -n "/^\/dev\//p" | tr -s ' ' | cut -d ' ' -f1,5 >> "/etc/disk.partition"
+		echo "MSDOS)" >> "/etc/disk.partition"
+		fdisk /dev/$hd -l | sed -n "/^\/dev\//p" | tr -d '*' | tr -s ' ' | cut -d ' ' -f1,5 >> "/etc/disk.partition"
 	else
-		echo "GPT" >> "/etc/disk.partition"
+		echo "GPT)" >> "/etc/disk.partition"
 		for part in $(cat /proc/partitions | tr -s ' ' | cut -d ' ' -f5 | grep -o -e "$hd[0-9][0-9]*$"); do
 			LINE="/dev/$part "
 			LINE=$LINE$(sgdisk /dev/$hd -i ${part:3} | grep 'GUID code' | cut -d ' ' -f4)
@@ -141,7 +143,6 @@ done
 
 echo "Partitions:"
 cat "/etc/disk.partition"
-
 # Check for standard swap partitions and make them available to the system
 HAVE_SWAP=no
 for swppart in $(grep -e "82$\|0657FD6D-A4AB-43C4-84E5-0933C84B4F4F$" /etc/disk.partition | cut -d ' ' -f1); do
@@ -162,37 +163,28 @@ for openslxpart in $(grep -e "46$\|46000000-0000-0000-0000-000000000000$" /etc/d
 	echo -e "${openslxpart}\t/media/${openslxpart#/dev/*}\tauto\t\tnoauto\t\t 0 0" >> "/etc/fstab"
 done
 
-# We use special non assigned partition type (id44) for harddisk scratch
-# space, thus no normal filesystem will be incidentally deleted or
-# corrupted
-
-# Put detected linux partitions (83) into /etc/fstab with "noauto", special
-# partition 45 (persistent scratch) to /var/scratch and 46 to /var/openslx
-
-# for partid in 83 0FC63DAF-8483-4772-8E79-3D69D8477DE4 49 48 47 46; do
-
 HAVE_TEMP="no"
 for (( i = 1; i < $COUNTER; i++ )); do
-	for hdpartnr in $(grep -e ${PARTTBL["$i/id"]} /etc/disk.partition | cut -d ' ' -f1); do
+	for hdpartnr in $(grep -e ${PARTTBL["$i/id"]}"$\|"${PARTTBL["$i/id"]}"000000-0000-0000-0000-000000000000$" /etc/disk.partition | cut -d ' ' -f1); do
 		if [ "${PARTTBL["$i/mountpoint"]}" = "/tmp" ]; then
 			if diskfm "$hdpartnr"; then
 				# echo "$hdpartnr is mounted to /mnt/tmp at $(sysup)" >/tmp/tmpready
 				mount_temp "$mopt" "$hdpartnr" || continue
 				echo -e "${hdpartnr}\t/tmp\t\tauto\t\tnoexec\t 0 0" >> "/etc/fstab"
 				HAVE_TEMP="yes"
-				break
+				PARTTBL["$i/persistent"]="yes"
 			else
 				echo "formatting failed for some reason"
 			fi # Made this non-forking, systemd should handle it - 2013-05-28
+		else
+			mount_part "${PARTTBL["$i/mountpoint"]}" $hdpartnr
+			PARTTBL["$i/persistent"]="yes"
 		fi
-		mount_part "${PARTTBL["$i/mountpoint"]}" $hdpartnr
-		PARTTBL["$i/persistent"]="yes"
 	done
 	[ "${PARTTBL["$i/persistent"]}" = "no" -a -d "${PARTTBL["$i/mountpoint"]}" ] && rm -f "${PARTTBL["$i/mountpoint"]}"
 done
 
 mount -a
-
 # Make huge tmpfs if nothing could be mounted for /tmp
 if [ "$HAVE_TEMP" = "no" ]; then
 	 mount_temp -t tmpfs -o size=20G none
@@ -201,5 +193,4 @@ fi
 if [ "$HAVE_SWAP" = "no" ]; then
 	slxlog "partition-swap" "Have no (formatted) swap partition, using zram swap only!" "/etc/disk.partition"
 fi
-
 exit 0
\ No newline at end of file
diff --git a/server/modules/partitioner/opt/openslx/scripts/partitioner b/server/modules/partitioner/opt/openslx/scripts/partitioner
index e5e94f4e..03b30442 100755
--- a/server/modules/partitioner/opt/openslx/scripts/partitioner
+++ b/server/modules/partitioner/opt/openslx/scripts/partitioner
@@ -3,7 +3,8 @@
 # set -e
 
 PARTITIONSPATH="/proc/partitions"
-CONFIGPATH="/opt/openslx/config"
+CONFIGPATH="./config"
+# CONFIGPATH="/opt/openslx/config"
 
 # BLOCKSIZE=$(sfdisk -l /dev/$CHOSENDISK | grep -o -e "blocks of [0-9]* bytes" | cut -d ' ' -f3)
 BLOCKSIZE=1024
@@ -19,6 +20,10 @@ if [ -z "$DISKS" ]; then
   exit 1
 fi
 if [ -z "$SLX_CHOOSEN_DISK" ]; then
+  if [ $SLX_AUTOMATIC_PARTITIONING = "yes" ]; then
+    dialog --msgbox "ERROR: You didn' define any hard disk in your configuration file." 10 40
+    exit 1
+  fi
   DIALOGSTR="This computer has the following partitions:\n"
   for disk in $DISKS; do
     DISKSIZE=$(($(cat $PARTITIONSPATH | grep -e $disk$ | tr -s ' ' | cut -d ' ' -f4)*$BLOCKSIZE))
@@ -63,33 +68,39 @@ if [ -z "$SLX_CHOOSEN_DISK" ]; then
     exit 1
   fi
 fi
+if [ -z "$SLX_PARTITION_TABLE" ]; then
+  if [ $SLX_AUTOMATIC_PARTITIONING = "yes" ]; then
+    SLX_PARTITION_TABLE='     
+    44,10G,/tmp
+    45,10G,/var/scratch'
+  else
+    dialog --msgbox "ERROR: You didn't set a valid partition table. Please check your config file." 10 40
+    exit 1  
+  fi
+fi
+
 # if SLX_PARTITION_TABLE is set then put his content in a associative array
 declare -A PARTTBL
 COUNTER=1
-if [ -n "$SLX_PARTITION_TABLE" ]; then
-  for PARTITION in $SLX_PARTITION_TABLE; do
-    IFS=,
-    set $PARTITION
-    if [ $COUNTER -eq 4 ]; then
-      COUNTER=$(($COUNTER+1))
-    fi
-    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/id"]=$1
-    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/size"]=$(echo $2 | egrep -o "[0-9]*")
-    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/mountpoint"]=$3
-    if [ -e $4 ]; then
-      PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=0
-    else
-      PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=1
-    fi
-    # set the partitions to non-existents
-    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/exists"]=0
+for PARTITION in $SLX_PARTITION_TABLE; do
+  IFS=,
+  set $PARTITION
+  if [ $COUNTER -eq 4 ]; then
     COUNTER=$(($COUNTER+1))
-  done
-  unset IFS
-else
-    dialog --msgbox "ERROR: You didn't set a valid partition table. Please check your config file." 10 40
-    exit 1  
-fi
+  fi
+  PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/id"]=$1
+  PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/size"]=$(echo $2 | egrep -o "[0-9]*")
+  PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/mountpoint"]=$3
+  if [ -e $4 ]; then
+    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=0
+  else
+    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=1
+  fi
+  # set the partitions to non-existents
+  PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/exists"]=0
+  COUNTER=$(($COUNTER+1))
+done
+unset IFS
 # PARTTBL starts at 1 and ends at COUNTER-1
 
 # check if the choosen disk is greater than the new partition table size.
@@ -101,7 +112,6 @@ for (( i = 1; i < $COUNTER; i++ )); do
   fi
 done
 NEEDED_SPACE=$(($NEEDED_SPACE*1024*1024*1024+$COUNTER*1024*1024))
-echo "$DISKSIZE -lt $NEEDED_SPACE"
 if [ $DISKSIZE -lt $NEEDED_SPACE ]; then
   dialog --msgbox "ERROR: Insufficient space in disk /dev/$SLX_CHOOSEN_DISK." 6 40
   exit 1
@@ -109,15 +119,18 @@ fi
 
 # choosing the partition type (MSDOS or GPT) if it wasn't set in config file
 if [ -z "$SLX_PARTITION_TYPE" ]; then
-  SLX_PARTITION_TYPE=msdos
-  ANS=$(dialog --no-tags --menu "Choose the partitions type" 0 0 0 "1" " MSDOS " "2" " GPT " 3>&1 1>&2 2>&3)
-  if [ $? -eq 1 ]; then
-    exit 1
-  fi
-  if [ $ANS -eq 1 ]; then
+  if [ $SLX_AUTOMATIC_PARTITIONING = "yes" ]; then
     SLX_PARTITION_TYPE=msdos
   else
-    SLX_PARTITION_TYPE=GPT
+    ANS=$(dialog --no-tags --menu "Choose the partitions type" 0 0 0 "1" " MSDOS " "2" " GPT " 3>&1 1>&2 2>&3)
+    if [ $? -eq 1 ]; then
+      exit 1
+    fi
+    if [ $ANS -eq 1 ]; then
+      SLX_PARTITION_TYPE=msdos
+    else
+      SLX_PARTITION_TYPE=GPT
+    fi
   fi
 fi
 
@@ -140,7 +153,7 @@ DIALOGSTR=$DIALOGSTR"   Free  $FREESPACE ($GBSIZE GB)\n\n"
 DIALOGSTR=$DIALOGSTR"All /dev/$SLX_CHOOSEN_DISK partitions will be deleted, ok?"
 
 # asking confirmation to create the partitions
-if [[ $SLX_AUTOMATIC_PARTITIONING = "no" && SLX_DELETE_PARTITION_TABLE = 'yes' ]]; then
+if [[ $SLX_AUTOMATIC_PARTITIONING = "no" && $SLX_DELETE_PARTITION_TABLE = 'yes' ]]; then
   dialog --defaultno --yesno "$DIALOGSTR" 0 0
   if [ $? -eq 1 ]; then
     exit 1
@@ -188,7 +201,7 @@ elif [ $(sfdisk -d /dev/$SLX_CHOOSEN_DISK 2> /dev/null | grep $SLX_CHOOSEN_DISK'
     for (( i = 1; i < $COUNTER; i++ )); do
       if [ $i -ne 4 ]; then
         if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]} = 0 ]; then
-          sgdisk /dev/$SLX_CHOOSEN_DISK -i ${PART:3} | grep ${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}"000000-0000-0000-0000-000000000000" > /dev/null
+          sgdisk /dev/$SLX_CHOOSEN_DISK -i ${PART:3} 2> /dev/null | grep ${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}"000000-0000-0000-0000-000000000000" > /dev/null
           if [ $? -eq 0 ]; then
             echo "the partition $PART is the ${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]} partition."
             PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]=$PART
@@ -243,7 +256,7 @@ if [ $SLX_PARTITION_TYPE = 'GPT' ]; then
       CMD=$CMD" -c "$i":\""${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}"\""
     fi
   done
-  CMD=$CMD" > /dev/null"
+  CMD=$CMD" > /dev/null 2> /dev/null"
   $CMD
 
   for (( i = 1; i < $COUNTER; i++ )); do
-- 
cgit v1.2.3-55-g7522


From a219790a526046004a2f3c0ec66b3158deb3670f Mon Sep 17 00:00:00 2001
From: Lucas Affonso Xavier de Morais
Date: Wed, 27 Aug 2014 12:42:49 -0300
Subject: [partitioner] SLX_DELETE_PARTITION_TABLE='no' working for GPT
 partition table type.

---
 .../partitioner/opt/openslx/scripts/partitioner    | 188 +++++++++++++--------
 1 file changed, 121 insertions(+), 67 deletions(-)

(limited to 'server/modules')

diff --git a/server/modules/partitioner/opt/openslx/scripts/partitioner b/server/modules/partitioner/opt/openslx/scripts/partitioner
index 03b30442..8eaf48a7 100755
--- a/server/modules/partitioner/opt/openslx/scripts/partitioner
+++ b/server/modules/partitioner/opt/openslx/scripts/partitioner
@@ -6,7 +6,7 @@ PARTITIONSPATH="/proc/partitions"
 CONFIGPATH="./config"
 # CONFIGPATH="/opt/openslx/config"
 
-# BLOCKSIZE=$(sfdisk -l /dev/$CHOSENDISK | grep -o -e "blocks of [0-9]* bytes" | cut -d ' ' -f3)
+# BLOCKSIZE=$(sfdisk -l /dev/$SLX_CHOOSEN_DISK | grep -o -e "blocks of [0-9]* bytes" | cut -d ' ' -f3)
 BLOCKSIZE=1024
 
 . $CONFIGPATH
@@ -90,11 +90,13 @@ for PARTITION in $SLX_PARTITION_TABLE; do
   fi
   PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/id"]=$1
   PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/size"]=$(echo $2 | egrep -o "[0-9]*")
-  PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/mountpoint"]=$3
-  if [ -e $4 ]; then
-    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=0
-  else
+  if [ -n $3 ]; then
+    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/mountpoint"]=$3
+  fi
+  if [ -n $4 ]; then
     PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=1
+  else
+    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=0
   fi
   # set the partitions to non-existents
   PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/exists"]=0
@@ -194,30 +196,129 @@ if [ $SLX_DELETE_PARTITION_TABLE = "yes" ]; then
   done
   sfdisk -q -f /dev/$SLX_CHOOSEN_DISK < /tmp/partitiontable.tmp > /dev/null
   # rm -f /tmp/partitiontable.tmp
-elif [ $(sfdisk -d /dev/$SLX_CHOOSEN_DISK 2> /dev/null | grep $SLX_CHOOSEN_DISK'1' | tr -s ' ' | cut -d ' ' -f7 | cut -d '=' -f2) = 'ee' ]; then
-# finding existent partitions in GPT
-  echo 'GPT'
-  for PART in $PARTS; do
+  #------
+  DIALOGSTR="New partitions created:\n\n"
+  if [ $SLX_PARTITION_TYPE = 'GPT' ]; then
+    # create the command (CMD) that will convert the MSDOS type to GPT, change the unique GUIDs and set the bootable flags.
+    CMD="sgdisk -g /dev/$SLX_CHOOSEN_DISK"
     for (( i = 1; i < $COUNTER; i++ )); do
       if [ $i -ne 4 ]; then
-        if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]} = 0 ]; then
-          sgdisk /dev/$SLX_CHOOSEN_DISK -i ${PART:3} 2> /dev/null | grep ${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}"000000-0000-0000-0000-000000000000" > /dev/null
-          if [ $? -eq 0 ]; then
-            echo "the partition $PART is the ${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]} partition."
-            PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]=$PART
-            NEEDED_SPACE=$(($NEEDED_SPACE-${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
-            break
-          fi
+        if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" != "82" ] && [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" != "83" ]; then
+          CMD=$CMD" -t "$i":"${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}"000000-0000-0000-0000-000000000000"
+          CMD=$CMD" -c "$i":\""${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}"\""
+        fi
+        if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/bootable"]} -eq 1 ]; then
+        	CMD=$CMD" -A "$i":set:2"
+        fi
+      fi
+    done
+    CMD=$CMD" > /dev/null 2> /dev/null"
+    $CMD
+    for (( i = 1; i < $COUNTER; i++ )); do
+      if [ $i -ne 4 ]; then
+        SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
+        ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
+        MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
+        DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"$SLX_CHOOSEN_DISK$i")\n"
+        if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "82" ]; then
+          DIALOGSTR=$DIALOGSTR"   GUID: 0657FD6D-A4AB-43C4-84E5-0933C84B4F4F\n"
+        elif [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "83" ]; then
+          DIALOGSTR=$DIALOGSTR"   GUID: 0FC63DAF-8483-4772-8E79-3D69D8477DE4\n"
+        else
+          DIALOGSTR=$DIALOGSTR"   GUID: "$ID"000000-0000-0000-0000-000000000000\n"
         fi
+        DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
       fi
     done
+  else
+    for (( i = 1; i < $COUNTER; i++ )); do
+      if [ $i -lt 4 ]; then
+        SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
+        ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
+        MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
+        DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"$SLX_CHOOSEN_DISK$i")\n"
+        DIALOGSTR=$DIALOGSTR"   Type: Primary\n"
+        DIALOGSTR=$DIALOGSTR"   ID: "$ID"\n"
+        DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
+      elif [ $i -gt 4 ]; then
+        SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
+        ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
+        MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
+        DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"$SLX_CHOOSEN_DISK$i")\n"
+        DIALOGSTR=$DIALOGSTR"   Type: Logical\n"
+        DIALOGSTR=$DIALOGSTR"   ID: "$ID"\n"
+        DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
+      fi
+    done
+  fi
+elif [ $(sfdisk -d /dev/$SLX_CHOOSEN_DISK 2> /dev/null | grep $SLX_CHOOSEN_DISK'1' | tr -s ' ' | cut -d ' ' -f7 | cut -d '=' -f2) = 'ee' ]; then
+# finding existent partitions in GPT
+  echo 'GPT'
+  NONEXISTENT_PARTITIONS="false"
+  for (( i = 1; i < $COUNTER; i++ )); do
+    if [ $i -ne 4 ]; then
+			for PART in $PARTS; do
+        if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "82" ]; then
+          sgdisk /dev/$SLX_CHOOSEN_DISK -i ${PART:3} 2> /dev/null | grep "0657FD6D-A4AB-43C4-84E5-0933C84B4F4F" > /dev/null
+        elif [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "83" ]; then
+          sgdisk /dev/$SLX_CHOOSEN_DISK -i ${PART:3} 2> /dev/null | grep "0FC63DAF-8483-4772-8E79-3D69D8477DE4" > /dev/null
+        else
+          sgdisk /dev/$SLX_CHOOSEN_DISK -i ${PART:3} 2> /dev/null | grep ${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}"000000-0000-0000-0000-000000000000" > /dev/null
+        fi
+        if [ $? -eq 0 ]; then
+          PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]=$PART
+          NEEDED_SPACE=$(($NEEDED_SPACE-${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
+          break
+        fi
+  		done
+  		if [[ ${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]} = "0" ]]; then
+	    	NONEXISTENT_PARTITIONS="true"
+  		fi
+    fi
   done
-  echo "FREESPACE="$FREESPACE
-  echo "NEEDED_SPACE="$NEEDED_SPACE  
+  # checking if there's sufficient space for the new partitions.
   if [[ $FREESPACE -lt $NEEDED_SPACE ]]; then
     dialog --msgbox "ERROR: Insufficient free space in disk /dev/$SLX_CHOOSEN_DISK." 6 40
     exit 1
   fi
+  if [[ $NONEXISTENT_PARTITIONS = "false" ]]; then
+  	DIALOGSTR="All your requested partitions already exists.\n\n"
+  	DIALOGSTR=$DIALOGSTR"Partition    ID\n"
+	  for (( i = 1; i < $COUNTER; i++ )); do
+	  	if [[ $i -ne 4 ]]; then
+	  		DIALOGSTR=$DIALOGSTR"${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]}         ${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}\n"
+	  	fi
+	  done
+	else
+	  DIALOGSTR="New partitions created:\n\n"
+	  for (( i = 1; i < $COUNTER; i++ )); do
+	    j=1
+	    if [[ "${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]}" = "0" ]]; then
+	      sgdisk /dev/$SLX_CHOOSEN_DISK -n $j:0:+${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}G 2> /dev/null > /dev/null
+	      while [[ $? -eq 4 ]]; do
+	        j=$(($j+1))
+	        sgdisk /dev/$SLX_CHOOSEN_DISK -n $j:0:+${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}G 2> /dev/null > /dev/null
+	      done
+	      PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]=$SLX_CHOOSEN_DISK$j
+	      SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
+	      ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
+	      MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
+	      DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]}")\n"
+	      if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "82" ]; then
+	        DIALOGSTR=$DIALOGSTR"   GUID: 0657FD6D-A4AB-43C4-84E5-0933C84B4F4F\n"
+	      elif [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "83" ]; then
+	        DIALOGSTR=$DIALOGSTR"   GUID: 0FC63DAF-8483-4772-8E79-3D69D8477DE4\n"
+	      else
+	      	sgdisk /dev/$SLX_CHOOSEN_DISK -t $j:$ID"000000-0000-0000-0000-000000000000" -c $j:$MOUNTPOINT
+	        DIALOGSTR=$DIALOGSTR"   GUID: "$ID"000000-0000-0000-0000-000000000000\n"
+	      fi
+	      DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
+	    fi
+      if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/bootable"]} -eq 1 ]; then
+      	sgdisk /dev/$SLX_CHOOSEN_DISK -A $j:set:2
+      fi
+	  done
+  fi
 else
 # finding existent partitions in MS-DOS
   echo 'MSDOS'
@@ -244,51 +345,4 @@ else
   fi
 fi
 
-DIALOGSTR="New partitions created:\n\n"
-if [ $SLX_PARTITION_TYPE = 'GPT' ]; then
-  # create the command (CMD) that will convert the MSDOS type to GPT and change the unique GUIDs
-  CMD="sgdisk -g /dev/$SLX_CHOOSEN_DISK"
-  for (( i = 1; i < $COUNTER; i++ )); do
-    if [ $i -ne 4 ]; then
-      if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]} = 0 ]; then
-        CMD=$CMD" -t "$i":"${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}"000000-0000-0000-0000-000000000000"
-      fi
-      CMD=$CMD" -c "$i":\""${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}"\""
-    fi
-  done
-  CMD=$CMD" > /dev/null 2> /dev/null"
-  $CMD
-
-  for (( i = 1; i < $COUNTER; i++ )); do
-    if [ $i -ne 4 ]; then
-      SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
-      ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
-      MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
-      DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"$SLX_CHOOSEN_DISK$i")\n"
-      DIALOGSTR=$DIALOGSTR"   GUID: "$ID"000000-0000-0000-0000-000000000000\n"
-      DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
-    fi
-  done
-else
-  for (( i = 1; i < $COUNTER; i++ )); do
-    if [ $i -lt 4 ]; then
-      SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
-      ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
-      MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
-      DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"$SLX_CHOOSEN_DISK$i")\n"
-      DIALOGSTR=$DIALOGSTR"   Type: Primary\n"
-      DIALOGSTR=$DIALOGSTR"   ID: "$ID"\n"
-      DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
-    elif [ $i -gt 4 ]; then
-      SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
-      ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
-      MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
-      DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"$SLX_CHOOSEN_DISK$i")\n"
-      DIALOGSTR=$DIALOGSTR"   Type: Logical\n"
-      DIALOGSTR=$DIALOGSTR"   ID: "$ID"\n"
-      DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
-    fi
-  done
-fi
-
-dialog --msgbox "$DIALOGSTR" 0 0
+dialog --msgbox "$DIALOGSTR" 0 0
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From a31d00dd550522b829e263477cb2b5d2a481be44 Mon Sep 17 00:00:00 2001
From: Lucas Affonso Xavier de Morais
Date: Thu, 28 Aug 2014 12:28:51 -0300
Subject: [partitioner] progress bar added on creation of new partitions.

---
 .../partitioner/opt/openslx/scripts/partitioner    | 83 +++++++++++-----------
 1 file changed, 43 insertions(+), 40 deletions(-)

(limited to 'server/modules')

diff --git a/server/modules/partitioner/opt/openslx/scripts/partitioner b/server/modules/partitioner/opt/openslx/scripts/partitioner
index 8eaf48a7..14f47389 100755
--- a/server/modules/partitioner/opt/openslx/scripts/partitioner
+++ b/server/modules/partitioner/opt/openslx/scripts/partitioner
@@ -93,7 +93,7 @@ for PARTITION in $SLX_PARTITION_TABLE; do
   if [ -n $3 ]; then
     PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/mountpoint"]=$3
   fi
-  if [ -n $4 ]; then
+  if [ -n "$4" ]; then
     PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=1
   else
     PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=0
@@ -194,28 +194,24 @@ if [ $SLX_DELETE_PARTITION_TABLE = "yes" ]; then
       START=$(($START+1*1024*1024/$SECTORSIZE))
     fi
   done
-  sfdisk -q -f /dev/$SLX_CHOOSEN_DISK < /tmp/partitiontable.tmp > /dev/null
+  sfdisk -q -f /dev/$SLX_CHOOSEN_DISK < /tmp/partitiontable.tmp > /dev/null 2> /dev/null
   # rm -f /tmp/partitiontable.tmp
   #------
-  DIALOGSTR="New partitions created:\n\n"
   if [ $SLX_PARTITION_TYPE = 'GPT' ]; then
     # create the command (CMD) that will convert the MSDOS type to GPT, change the unique GUIDs and set the bootable flags.
-    CMD="sgdisk -g /dev/$SLX_CHOOSEN_DISK"
+  	DIALOGSTR="Creating Partitions...\n\n"
+  	echo "0" | dialog --gauge "$DIALOGSTR" 0 0 0
+    sgdisk /dev/$SLX_CHOOSEN_DISK -g >/dev/null 2>/dev/null
     for (( i = 1; i < $COUNTER; i++ )); do
       if [ $i -ne 4 ]; then
+    		# dialog --msgbox "$DIALOGSTR" 0 0
         if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" != "82" ] && [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" != "83" ]; then
-          CMD=$CMD" -t "$i":"${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}"000000-0000-0000-0000-000000000000"
-          CMD=$CMD" -c "$i":\""${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}"\""
+          sgdisk /dev/$SLX_CHOOSEN_DISK -t $i:${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}000000-0000-0000-0000-000000000000\
+          sgdisk /dev/$SLX_CHOOSEN_DISK -c $i:\"${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}\" >/dev/null 2>/dev/null
         fi
         if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/bootable"]} -eq 1 ]; then
-        	CMD=$CMD" -A "$i":set:2"
+        	sgdisk /dev/$SLX_CHOOSEN_DISK -A $i:set:2 >/dev/null 2>/dev/null
         fi
-      fi
-    done
-    CMD=$CMD" > /dev/null 2> /dev/null"
-    $CMD
-    for (( i = 1; i < $COUNTER; i++ )); do
-      if [ $i -ne 4 ]; then
         SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
         ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
         MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
@@ -228,6 +224,7 @@ if [ $SLX_DELETE_PARTITION_TABLE = "yes" ]; then
           DIALOGSTR=$DIALOGSTR"   GUID: "$ID"000000-0000-0000-0000-000000000000\n"
         fi
         DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
+        echo $(( $i*100/($COUNTER-1) )) | dialog --gauge "$DIALOGSTR" 0 0 0
       fi
     done
   else
@@ -254,7 +251,7 @@ if [ $SLX_DELETE_PARTITION_TABLE = "yes" ]; then
 elif [ $(sfdisk -d /dev/$SLX_CHOOSEN_DISK 2> /dev/null | grep $SLX_CHOOSEN_DISK'1' | tr -s ' ' | cut -d ' ' -f7 | cut -d '=' -f2) = 'ee' ]; then
 # finding existent partitions in GPT
   echo 'GPT'
-  NONEXISTENT_PARTITIONS="false"
+  NONEXISTENT_PARTITIONS=0
   for (( i = 1; i < $COUNTER; i++ )); do
     if [ $i -ne 4 ]; then
 			for PART in $PARTS; do
@@ -272,7 +269,7 @@ elif [ $(sfdisk -d /dev/$SLX_CHOOSEN_DISK 2> /dev/null | grep $SLX_CHOOSEN_DISK'
         fi
   		done
   		if [[ ${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]} = "0" ]]; then
-	    	NONEXISTENT_PARTITIONS="true"
+	    	NONEXISTENT_PARTITIONS=$(($NONEXISTENT_PARTITIONS+1))
   		fi
     fi
   done
@@ -281,7 +278,7 @@ elif [ $(sfdisk -d /dev/$SLX_CHOOSEN_DISK 2> /dev/null | grep $SLX_CHOOSEN_DISK'
     dialog --msgbox "ERROR: Insufficient free space in disk /dev/$SLX_CHOOSEN_DISK." 6 40
     exit 1
   fi
-  if [[ $NONEXISTENT_PARTITIONS = "false" ]]; then
+  if [[ $NONEXISTENT_PARTITIONS -eq 0 ]]; then
   	DIALOGSTR="All your requested partitions already exists.\n\n"
   	DIALOGSTR=$DIALOGSTR"Partition    ID\n"
 	  for (( i = 1; i < $COUNTER; i++ )); do
@@ -290,33 +287,39 @@ elif [ $(sfdisk -d /dev/$SLX_CHOOSEN_DISK 2> /dev/null | grep $SLX_CHOOSEN_DISK'
 	  	fi
 	  done
 	else
-	  DIALOGSTR="New partitions created:\n\n"
+	  DIALOGSTR="Creating partitions...\n\n"
+	  echo "0" | dialog --gauge "$DIALOGSTR" 0 0 0
+    CREATED=0
 	  for (( i = 1; i < $COUNTER; i++ )); do
 	    j=1
-	    if [[ "${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]}" = "0" ]]; then
-	      sgdisk /dev/$SLX_CHOOSEN_DISK -n $j:0:+${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}G 2> /dev/null > /dev/null
-	      while [[ $? -eq 4 ]]; do
-	        j=$(($j+1))
-	        sgdisk /dev/$SLX_CHOOSEN_DISK -n $j:0:+${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}G 2> /dev/null > /dev/null
-	      done
-	      PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]=$SLX_CHOOSEN_DISK$j
-	      SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
-	      ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
-	      MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
-	      DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]}")\n"
-	      if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "82" ]; then
-	        DIALOGSTR=$DIALOGSTR"   GUID: 0657FD6D-A4AB-43C4-84E5-0933C84B4F4F\n"
-	      elif [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "83" ]; then
-	        DIALOGSTR=$DIALOGSTR"   GUID: 0FC63DAF-8483-4772-8E79-3D69D8477DE4\n"
-	      else
-	      	sgdisk /dev/$SLX_CHOOSEN_DISK -t $j:$ID"000000-0000-0000-0000-000000000000" -c $j:$MOUNTPOINT
-	        DIALOGSTR=$DIALOGSTR"   GUID: "$ID"000000-0000-0000-0000-000000000000\n"
+	    if [[ $i -ne 4 ]]; then
+		    if [[ "${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]}" = "0" ]]; then
+		      sgdisk /dev/$SLX_CHOOSEN_DISK -n $j:0:+${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}G 2> /dev/null > /dev/null
+		      while [[ $? -eq 4 ]]; do
+		        j=$(($j+1))
+		        sgdisk /dev/$SLX_CHOOSEN_DISK -n $j:0:+${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}G 2> /dev/null > /dev/null
+		      done
+		      PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]=$SLX_CHOOSEN_DISK$j
+		      SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
+		      ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
+		      MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
+		      DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]}")\n"
+		      if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "82" ]; then
+		        DIALOGSTR=$DIALOGSTR"   GUID: 0657FD6D-A4AB-43C4-84E5-0933C84B4F4F\n"
+		      elif [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "83" ]; then
+		        DIALOGSTR=$DIALOGSTR"   GUID: 0FC63DAF-8483-4772-8E79-3D69D8477DE4\n"
+		      else
+		      	sgdisk /dev/$SLX_CHOOSEN_DISK -t $j:$ID"000000-0000-0000-0000-000000000000" -c $j:$MOUNTPOINT >/dev/null 2>/dev/null
+		        DIALOGSTR=$DIALOGSTR"   GUID: "$ID"000000-0000-0000-0000-000000000000\n"
+		      fi
+		      DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
+		      CREATED=$(($CREATED+1))
+	      	echo $(( $CREATED*100/($NONEXISTENT_PARTITIONS) )) | dialog --gauge "$DIALOGSTR" 0 0 0
+		    fi
+	      if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/bootable"]} -eq 1 ]; then
+	      	sgdisk /dev/$SLX_CHOOSEN_DISK -A $j:set:2 >/dev/null 2>/deb/null
 	      fi
-	      DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
 	    fi
-      if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/bootable"]} -eq 1 ]; then
-      	sgdisk /dev/$SLX_CHOOSEN_DISK -A $j:set:2
-      fi
 	  done
   fi
 else
@@ -344,5 +347,5 @@ else
     exit 1
   fi
 fi
-
+DIALOGSTR=${DIALOGSTR/Creating Partitions.../New partitions created:}
 dialog --msgbox "$DIALOGSTR" 0 0
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 11b8aae7d80d58f86b8c55b9c20fc06288004c3c Mon Sep 17 00:00:00 2001
From: Lucas Affonso Xavier de Morais
Date: Fri, 29 Aug 2014 09:46:07 -0300
Subject: [partitioner] minor fixes

---
 server/modules/partitioner/opt/openslx/scripts/partitioner | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'server/modules')

diff --git a/server/modules/partitioner/opt/openslx/scripts/partitioner b/server/modules/partitioner/opt/openslx/scripts/partitioner
index 14f47389..75ac7105 100755
--- a/server/modules/partitioner/opt/openslx/scripts/partitioner
+++ b/server/modules/partitioner/opt/openslx/scripts/partitioner
@@ -120,7 +120,7 @@ if [ $DISKSIZE -lt $NEEDED_SPACE ]; then
 fi
 
 # choosing the partition type (MSDOS or GPT) if it wasn't set in config file
-if [ -z "$SLX_PARTITION_TYPE" ]; then
+if [ -z "$SLX_PARTITION_TYPE" ] && [ $SLX_DELETE_PARTITION_TABLE = "yes" ]; then
   if [ $SLX_AUTOMATIC_PARTITIONING = "yes" ]; then
     SLX_PARTITION_TYPE=msdos
   else
@@ -228,6 +228,7 @@ if [ $SLX_DELETE_PARTITION_TABLE = "yes" ]; then
       fi
     done
   else
+  	DIALOGSTR="Creating Partitions...\n\n"
     for (( i = 1; i < $COUNTER; i++ )); do
       if [ $i -lt 4 ]; then
         SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
@@ -317,7 +318,7 @@ elif [ $(sfdisk -d /dev/$SLX_CHOOSEN_DISK 2> /dev/null | grep $SLX_CHOOSEN_DISK'
 	      	echo $(( $CREATED*100/($NONEXISTENT_PARTITIONS) )) | dialog --gauge "$DIALOGSTR" 0 0 0
 		    fi
 	      if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/bootable"]} -eq 1 ]; then
-	      	sgdisk /dev/$SLX_CHOOSEN_DISK -A $j:set:2 >/dev/null 2>/deb/null
+	      	sgdisk /dev/$SLX_CHOOSEN_DISK -A $j:set:2 >/dev/null 2>/dev/null
 	      fi
 	    fi
 	  done
-- 
cgit v1.2.3-55-g7522


From 8a4371379854de23034d67c3dfc835f6c70d0937 Mon Sep 17 00:00:00 2001
From: Lucas Affonso Xavier de Morais
Date: Thu, 4 Sep 2014 10:33:05 -0300
Subject: [partitioner] changed the way GPT partitions are created.

---
 .../partitioner/opt/openslx/scripts/partitioner    | 56 +++++++++++-----------
 1 file changed, 29 insertions(+), 27 deletions(-)

(limited to 'server/modules')

diff --git a/server/modules/partitioner/opt/openslx/scripts/partitioner b/server/modules/partitioner/opt/openslx/scripts/partitioner
index 75ac7105..23e90b18 100755
--- a/server/modules/partitioner/opt/openslx/scripts/partitioner
+++ b/server/modules/partitioner/opt/openslx/scripts/partitioner
@@ -174,42 +174,21 @@ if [ $SLX_DELETE_PARTITION_TABLE = "yes" ]; then
   # delete partition table
   sgdisk -Z /dev/$SLX_CHOOSEN_DISK > /dev/null 2> /dev/null # erase all partitions
 
-  # constructing the sfdisk input file
-  echo "unit: sectors
-  "> /tmp/partitiontable.tmp
-
-  START=$((1*1024*1024/$SECTORSIZE))
-  for (( i = 1; i < $COUNTER; i++ )); do
-    if [ $i -ne 4 ]; then
-      SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024/$SECTORSIZE))
-      ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
-      if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/bootable"]} -eq 1 ]; then
-        echo "/dev/"$SLX_CHOOSEN_DISK$i" : start= "$START", size= "$SIZE", Id= "$ID", bootable " >> /tmp/partitiontable.tmp
-      else
-        echo "/dev/"$SLX_CHOOSEN_DISK$i" : start= "$START", size= "$SIZE", Id= "$ID >> /tmp/partitiontable.tmp
-      fi
-      START=$(($START+$SIZE+1*1024*1024/$SECTORSIZE))
-    else
-      echo "/dev/"$SLX_CHOOSEN_DISK$i" : start= "$START", size= "$(($DISKSIZE/$SECTORSIZE-1))", Id= 5" >> /tmp/partitiontable.tmp
-      START=$(($START+1*1024*1024/$SECTORSIZE))
-    fi
-  done
-  sfdisk -q -f /dev/$SLX_CHOOSEN_DISK < /tmp/partitiontable.tmp > /dev/null 2> /dev/null
-  # rm -f /tmp/partitiontable.tmp
-  #------
   if [ $SLX_PARTITION_TYPE = 'GPT' ]; then
-    # create the command (CMD) that will convert the MSDOS type to GPT, change the unique GUIDs and set the bootable flags.
   	DIALOGSTR="Creating Partitions...\n\n"
   	echo "0" | dialog --gauge "$DIALOGSTR" 0 0 0
-    sgdisk /dev/$SLX_CHOOSEN_DISK -g >/dev/null 2>/dev/null
-    for (( i = 1; i < $COUNTER; i++ )); do
+    for (( i = 1; i < $COUNTER; i++ )); do  # loop that will create each GPT partition, change GUIDS, change names, and set bootable flags.
       if [ $i -ne 4 ]; then
+        sgdisk /dev/$SLX_CHOOSEN_DISK -n $i:0:+${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}G 2> /dev/null > /dev/null
     		# dialog --msgbox "$DIALOGSTR" 0 0
-        if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" != "82" ] && [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" != "83" ]; then
+        if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "82" ] || [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "83" ]; then
+          sgdisk /dev/$SLX_CHOOSEN_DISK -t $i:${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}00
+        else
           sgdisk /dev/$SLX_CHOOSEN_DISK -t $i:${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}000000-0000-0000-0000-000000000000\
           sgdisk /dev/$SLX_CHOOSEN_DISK -c $i:\"${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}\" >/dev/null 2>/dev/null
         fi
         if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/bootable"]} -eq 1 ]; then
+          # set the bootable flag
         	sgdisk /dev/$SLX_CHOOSEN_DISK -A $i:set:2 >/dev/null 2>/dev/null
         fi
         SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
@@ -228,6 +207,29 @@ if [ $SLX_DELETE_PARTITION_TABLE = "yes" ]; then
       fi
     done
   else
+    # constructing the sfdisk input file
+    echo "unit: sectors
+    "> /tmp/partitiontable.tmp
+
+    START=$((1*1024*1024/$SECTORSIZE))
+    for (( i = 1; i < $COUNTER; i++ )); do
+      if [ $i -ne 4 ]; then
+        SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024/$SECTORSIZE))
+        ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
+        if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/bootable"]} -eq 1 ]; then
+          echo "/dev/"$SLX_CHOOSEN_DISK$i" : start= "$START", size= "$SIZE", Id= "$ID", bootable " >> /tmp/partitiontable.tmp
+        else
+          echo "/dev/"$SLX_CHOOSEN_DISK$i" : start= "$START", size= "$SIZE", Id= "$ID >> /tmp/partitiontable.tmp
+        fi
+        START=$(($START+$SIZE+1*1024*1024/$SECTORSIZE))
+      else
+        echo "/dev/"$SLX_CHOOSEN_DISK$i" : start= "$START", size= "$(($DISKSIZE/$SECTORSIZE-1))", Id= 5" >> /tmp/partitiontable.tmp
+        START=$(($START+1*1024*1024/$SECTORSIZE))
+      fi
+    done
+    sfdisk -q -f /dev/$SLX_CHOOSEN_DISK < /tmp/partitiontable.tmp > /dev/null 2> /dev/null
+    # rm -f /tmp/partitiontable.tmp
+
   	DIALOGSTR="Creating Partitions...\n\n"
     for (( i = 1; i < $COUNTER; i++ )); do
       if [ $i -lt 4 ]; then
-- 
cgit v1.2.3-55-g7522


From 4bd3e981b74296b2108f20be4a3592291e07a047 Mon Sep 17 00:00:00 2001
From: Lucas Affonso Xavier de Morais
Date: Thu, 4 Sep 2014 11:52:18 -0300
Subject: [partitioner] minor fixes.

---
 .../opt/openslx/scripts/systemd-setup_partitions   | 26 +++++++++++++++-------
 .../partitioner/opt/openslx/scripts/partitioner    |  2 +-
 2 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'server/modules')

diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
index b282a486..236bb157 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
@@ -15,7 +15,9 @@
 #############################################################################
 
 # read global OpenSLX config
-. /opt/openslx/config || { echo "Could not source config!"; exit 23; }
+. config || { echo "Could not source config!"; exit 23; }
+
+set -xv
 
 # General formatter for the /tmp partition on a local harddisk
 diskfm () {
@@ -89,7 +91,7 @@ mount_temp_fallback () {
 	return 0
 }
 
-mount_partition() {
+mount_partition () {
 	local mountpoint="$1"
 	local partition="$2"
 	local options="$3"
@@ -108,7 +110,7 @@ mount_partition() {
 	echo -e "${partition}\t${mountpoint}\tauto\t\tnoauto,noexec\t\t 0 0" >> "/etc/fstab"
 }
 
-read_partitions() {
+read_partitions () {
 	# create the /etc/disk.partition file with all the partitions and respective id's (MSDOS and GPT)
 	echo "PARTITION - ID" > "/etc/disk.partition"
 	for hd in $(cat /proc/partitions | tr -s ' ' | cut -d ' ' -f5 | grep -o -e "[a-z]*$"); do
@@ -138,13 +140,19 @@ if [ -z "${SLX_PARTITION_TABLE}" ]; then
 		45,10G,/var/scratch,persistent'
 fi
 
+read_partitions
+
 for PARTITION in $SLX_PARTITION_TABLE; do
 	IFS=,
 	set $PARTITION
-	id=$1; shift
-	size=$1; shift
-	[ -e $1 ] && mountpoint="$1"; shift
-	[ $# -gt 0 ] && options="$*"
+	id=$1
+	shift
+	size=$1
+	shift
+	mountpoint="$1"
+	shift
+	options="$*"
+	unset IFS
 
 	case $id in
 		44)
@@ -180,7 +188,7 @@ for PARTITION in $SLX_PARTITION_TABLE; do
 			;;
 		*)
 			for hdpartnr in $(grep -e "${id}$\|${id}000000-0000-0000-0000-000000000000$" /etc/disk.partition | cut -d ' ' -f1); do
-				mount_part "${mountpoint}" $hdpartnr $options
+				mount_partition "${mountpoint}" $hdpartnr $options
 				if [ $? -ne 0 ]; then
 					echo "Mount of partition $hdpartnr on ${mountpoint} failed with exit code: $?"
 					[ -d "${mountpoint}" ] && rm -r "${mountpoint}"
@@ -210,4 +218,6 @@ if [ "$HAVE_SWAP" = "no" ]; then
 	slxlog "partition-swap" "Have no (formatted) swap partition, using zram swap only!" "/etc/disk.partition"
 fi
 
+set +xv
+
 exit 0
diff --git a/server/modules/partitioner/opt/openslx/scripts/partitioner b/server/modules/partitioner/opt/openslx/scripts/partitioner
index 23e90b18..03e089c4 100755
--- a/server/modules/partitioner/opt/openslx/scripts/partitioner
+++ b/server/modules/partitioner/opt/openslx/scripts/partitioner
@@ -93,7 +93,7 @@ for PARTITION in $SLX_PARTITION_TABLE; do
   if [ -n $3 ]; then
     PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/mountpoint"]=$3
   fi
-  if [ -n "$4" ]; then
+  if [ "$4" = "bootable" ]; then
     PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=1
   else
     PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=0
-- 
cgit v1.2.3-55-g7522


From a12eb5eeee3ffc1711fae8142160079e86a345a0 Mon Sep 17 00:00:00 2001
From: Lucas Affonso Xavier de Morais
Date: Fri, 5 Sep 2014 12:28:43 -0300
Subject: [partitioner] partitioner adapted to work with more options in
 SLX_PARTITION_TABLE

---
 .../modules/partitioner/opt/openslx/scripts/partitioner   | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'server/modules')

diff --git a/server/modules/partitioner/opt/openslx/scripts/partitioner b/server/modules/partitioner/opt/openslx/scripts/partitioner
index 03e089c4..0b682dba 100755
--- a/server/modules/partitioner/opt/openslx/scripts/partitioner
+++ b/server/modules/partitioner/opt/openslx/scripts/partitioner
@@ -12,8 +12,8 @@ BLOCKSIZE=1024
 . $CONFIGPATH
 # testing if the sizes and ID's of the disk is defined in the config file
 
-
 # picking disk that will be used
+
 DISKS=$(cat $PARTITIONSPATH | tr -s ' ' | cut -d ' ' -f5 | grep -e "[a-z]$")
 if [ -z "$DISKS" ]; then
   dialog --msgbox "ERROR: Can't find an hard disk." 10 40
@@ -88,12 +88,17 @@ for PARTITION in $SLX_PARTITION_TABLE; do
   if [ $COUNTER -eq 4 ]; then
     COUNTER=$(($COUNTER+1))
   fi
+  echo "id: $1"
   PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/id"]=$1
-  PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/size"]=$(echo $2 | egrep -o "[0-9]*")
-  if [ -n $3 ]; then
-    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/mountpoint"]=$3
+  shift
+  echo "size: $1"
+  PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/size"]=$(echo $1 | egrep -o "[0-9]*")
+  shift
+  if [ -n $1 ]; then
+    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/mountpoint"]=$1
   fi
-  if [ "$4" = "bootable" ]; then
+  shift
+  if [[ "$*" == *bootable* ]]; then
     PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=1
   else
     PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=0
-- 
cgit v1.2.3-55-g7522


From 25f25ec6d6fd3f5212d008ce9df8816b63492126 Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Thu, 11 Sep 2014 10:29:22 -0300
Subject: [partitioner] add systemd service

---
 .../multi-user.target.wants/partitioner.service      |  1 +
 .../etc/systemd/system/partitioner.service           | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 120000 server/modules/partitioner/etc/systemd/system/multi-user.target.wants/partitioner.service
 create mode 100644 server/modules/partitioner/etc/systemd/system/partitioner.service

(limited to 'server/modules')

diff --git a/server/modules/partitioner/etc/systemd/system/multi-user.target.wants/partitioner.service b/server/modules/partitioner/etc/systemd/system/multi-user.target.wants/partitioner.service
new file mode 120000
index 00000000..48defa3e
--- /dev/null
+++ b/server/modules/partitioner/etc/systemd/system/multi-user.target.wants/partitioner.service
@@ -0,0 +1 @@
+../partitioner.service
\ No newline at end of file
diff --git a/server/modules/partitioner/etc/systemd/system/partitioner.service b/server/modules/partitioner/etc/systemd/system/partitioner.service
new file mode 100644
index 00000000..1b6160c8
--- /dev/null
+++ b/server/modules/partitioner/etc/systemd/system/partitioner.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=Runs the OpenSLX Partitioning Tool
+After=killsplash.service
+After=systemd-vconsole-setup.service
+Before=display-manager.service getty@tty1.service getty@ttyUSB0.service
+Before=serial-getty@ttyS0.service serial-getty@ttyO0.service serial-getty@ttyO2.service
+Before=serial-getty@ttyAMA0.service serial-getty@ttymxc0.service serial-getty@ttymxc3.service
+Conflicts=killsplash.service
+ConditionKernelCommandLine=partition
+
+[Service]
+Type=oneshot
+ExecStart=/opt/openslx/scripts/systemd-partitioner
+TimeoutSec=0
+RemainAfterExit=yes
+SysVStartPriority=99
+StandardInput=tty
+StandardOutput=tty
+
+
-- 
cgit v1.2.3-55-g7522


From 4680624dd23bee959e60946457a2bfbec74e5701 Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Fri, 12 Sep 2014 15:39:42 -0300
Subject: [partitioner] corrected config path

---
 server/modules/partitioner/opt/openslx/scripts/partitioner | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'server/modules')

diff --git a/server/modules/partitioner/opt/openslx/scripts/partitioner b/server/modules/partitioner/opt/openslx/scripts/partitioner
index 0b682dba..a7ba064a 100755
--- a/server/modules/partitioner/opt/openslx/scripts/partitioner
+++ b/server/modules/partitioner/opt/openslx/scripts/partitioner
@@ -3,8 +3,7 @@
 # set -e
 
 PARTITIONSPATH="/proc/partitions"
-CONFIGPATH="./config"
-# CONFIGPATH="/opt/openslx/config"
+CONFIGPATH="/opt/openslx/config"
 
 # BLOCKSIZE=$(sfdisk -l /dev/$SLX_CHOOSEN_DISK | grep -o -e "blocks of [0-9]* bytes" | cut -d ' ' -f3)
 BLOCKSIZE=1024
@@ -356,4 +355,4 @@ else
   fi
 fi
 DIALOGSTR=${DIALOGSTR/Creating Partitions.../New partitions created:}
-dialog --msgbox "$DIALOGSTR" 0 0
\ No newline at end of file
+dialog --msgbox "$DIALOGSTR" 0 0
-- 
cgit v1.2.3-55-g7522


From 8ec740c8c3d8aecedfa790589cd2c71945715db1 Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Thu, 9 Oct 2014 16:11:18 -0300
Subject: [partitioner] reworked partitioner and setup-partitions, tested and
 working

---
 .../opt/openslx/scripts/systemd-setup_partitions   |  18 +-
 .../etc/systemd/system/partitioner.service         |   4 +-
 .../partitioner/opt/openslx/scripts/partitioner    | 358 ---------------
 .../opt/openslx/scripts/systemd-partitioner        | 482 +++++++++++++++++++++
 4 files changed, 494 insertions(+), 368 deletions(-)
 delete mode 100755 server/modules/partitioner/opt/openslx/scripts/partitioner
 create mode 100755 server/modules/partitioner/opt/openslx/scripts/systemd-partitioner

(limited to 'server/modules')

diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
index bd80890b..b18a97d5 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
@@ -58,7 +58,7 @@ diskfm () {
 					;;
 				esac
 				echo "formatting ${target} with $fs..."
-				mkfs.$fs ${fopt} "${target}" 2> /dev/null
+				mkfs.$fs ${fopt} "${target}" > /dev/null 2>&1
 			fi
 			[ -n "$found" ] && break
 		fi
@@ -74,7 +74,7 @@ mount_temp () {
 	mount $@ /tmp || return 1
 	chmod a+rwxt /tmp
 	# Move stuff from working directory, which is old /tmp, to new /tmp just mounted
-	mv ./* ./.[!.]* ./..?* /tmp/ 2> /dev/null
+	mv ./* ./.[!.]* ./..?* /tmp/ > /dev/null 2>&1
 	local OLD=$(LANG=C ls -alh | grep -v -E ' \.\.?$' | grep -v '^total')
 	[ -n "$OLD" ] && echo -- "Leftovers:" && echo -- "$OLD"
 	cd "$PRE"
@@ -82,7 +82,7 @@ mount_temp () {
 
 mount_temp_fallback () {
 	mkdir -p /tmptmp
-	mv /tmp/* /tmp/.* /tmptmp/ 2> /dev/null
+	mv /tmp/* /tmp/.* /tmptmp/ > /dev/null 2>&1
 	mount $@ /tmp || return 1
 	chmod a+rwxt /tmp
 	mv /tmptmp/* /tmptmp/.* /tmp/
@@ -95,7 +95,7 @@ mount_partition () {
 	local partition="$2"
 
 	mkdir -p "$mountpoint"
-	if ! blkid -s TYPE | grep "${partition}" ; then 
+	if ! blkid -s TYPE | grep "${partition}" ; then
 		echo "No fs found for ${partition}, formating..."
 		diskfm "$partition" "jfs xfs ext3" || return $?
 		mount -t auto -o noexec "$partition" "$mountpoint" || return $?
@@ -130,6 +130,7 @@ read_partitions () {
 
 	echo "Partitions:"
 	cat "/etc/disk.partition"
+	echo "------------------------------------------------------"
 }
 
 # default partitions, if not specifies in config (note: size is irrelevant for setup_partitions)
@@ -185,9 +186,9 @@ for PARTITION in $SLX_PARTITION_TABLE; do
 			# Check for standard swap partitions and make them available to the system
 			HAVE_SWAP=no
 			for swppart in $(grep -e "82$\|0657FD6D-A4AB-43C4-84E5-0933C84B4F4F$" /etc/disk.partition | cut -d ' ' -f1); do
-				echo "$swppart\tswap\t\tswap\t\tdefaults\t 0 0" >> "/etc/fstab"
-				swapon "$swppart" -p 10 && HAVE_SWAP=yes # low priority, in case we have zram swap, prefer that)
-				echo "swap partition found and activated"
+				echo -e "$swppart\tswap\t\tswap\t\tdefaults\t 0 0" >> "/etc/fstab"
+				mkswap "$swppart" && swapon "$swppart" -p 10 && HAVE_SWAP=yes # low priority, in case we have zram swap, prefer that)
+				[ $HAVE_SWAP = "yes" ] && echo "swap partition found and activated"
 			done
 			;;
 		*)
@@ -203,7 +204,7 @@ for PARTITION in $SLX_PARTITION_TABLE; do
 			done
 			;;
 	esac
-
+	echo "------------------------------------------------------"
 done
 
 #Put detected linux partitions (83) into /etc/fstab with "noauto"
@@ -212,6 +213,7 @@ for linuxpart in $(grep -e "83$\|0FC63DAF-8483-4772-8E79-3D69D8477DE4$" /etc/dis
 	mkdir -p "${mountpoint}/${linuxpart#/dev/*}"
 	echo "${linuxpart}\t${mountpoint}/${linuxpart#/dev/*}\tauto\t\tnoauto,noexec\t 0 0" >> "/etc/fstab"
 	echo "linux partition ${linuxpart} mounted on ${mountpoint}/${linuxpart#/dev/*}"
+	echo "------------------------------------------------------"
 done
 
 mount -a
diff --git a/server/modules/partitioner/etc/systemd/system/partitioner.service b/server/modules/partitioner/etc/systemd/system/partitioner.service
index 1b6160c8..85b41597 100644
--- a/server/modules/partitioner/etc/systemd/system/partitioner.service
+++ b/server/modules/partitioner/etc/systemd/system/partitioner.service
@@ -6,7 +6,7 @@ Before=display-manager.service getty@tty1.service getty@ttyUSB0.service
 Before=serial-getty@ttyS0.service serial-getty@ttyO0.service serial-getty@ttyO2.service
 Before=serial-getty@ttyAMA0.service serial-getty@ttymxc0.service serial-getty@ttymxc3.service
 Conflicts=killsplash.service
-ConditionKernelCommandLine=partition
+ConditionKernelCommandLine=partitioner
 
 [Service]
 Type=oneshot
@@ -16,5 +16,5 @@ RemainAfterExit=yes
 SysVStartPriority=99
 StandardInput=tty
 StandardOutput=tty
-
+StandardError=syslog
 
diff --git a/server/modules/partitioner/opt/openslx/scripts/partitioner b/server/modules/partitioner/opt/openslx/scripts/partitioner
deleted file mode 100755
index a7ba064a..00000000
--- a/server/modules/partitioner/opt/openslx/scripts/partitioner
+++ /dev/null
@@ -1,358 +0,0 @@
-#!/bin/bash
-
-# set -e
-
-PARTITIONSPATH="/proc/partitions"
-CONFIGPATH="/opt/openslx/config"
-
-# BLOCKSIZE=$(sfdisk -l /dev/$SLX_CHOOSEN_DISK | grep -o -e "blocks of [0-9]* bytes" | cut -d ' ' -f3)
-BLOCKSIZE=1024
-
-. $CONFIGPATH
-# testing if the sizes and ID's of the disk is defined in the config file
-
-# picking disk that will be used
-
-DISKS=$(cat $PARTITIONSPATH | tr -s ' ' | cut -d ' ' -f5 | grep -e "[a-z]$")
-if [ -z "$DISKS" ]; then
-  dialog --msgbox "ERROR: Can't find an hard disk." 10 40
-  exit 1
-fi
-if [ -z "$SLX_CHOOSEN_DISK" ]; then
-  if [ $SLX_AUTOMATIC_PARTITIONING = "yes" ]; then
-    dialog --msgbox "ERROR: You didn' define any hard disk in your configuration file." 10 40
-    exit 1
-  fi
-  DIALOGSTR="This computer has the following partitions:\n"
-  for disk in $DISKS; do
-    DISKSIZE=$(($(cat $PARTITIONSPATH | grep -e $disk$ | tr -s ' ' | cut -d ' ' -f4)*$BLOCKSIZE))
-    PARTS=$(cat $PARTITIONSPATH | grep -e $disk[0-9] | tr -s ' ' | cut -d ' ' -f5)
-    GBSIZE=$(echo "scale=2; $DISKSIZE/1024/1024/1024" | bc -l)
-    DIALOGSTR=$DIALOGSTR"$disk  $DISKSIZE Bytes ($GBSIZE GB)\n"
-    USED=0
-    for PART in $PARTS; do
-      PARTSIZE=$(($(cat $PARTITIONSPATH | grep -e $PART$ | tr -s ' ' | cut -d ' ' -f4)*1024))
-      USED=$(($USED+$PARTSIZE))
-      GBSIZE=$(echo "scale=2; $PARTSIZE/1024/1024/1024" | bc -l)
-      DIALOGSTR=$DIALOGSTR"   $PART   $PARTSIZE ($GBSIZE GB)\n"
-    done
-    DIALOGSTR=$DIALOGSTR"   ----------\n"
-    FREESPACE=$(($DISKSIZE-$USED))
-    GBSIZE=$(echo "scale=2; $USED/1024/1024/1024" | bc -l)
-    DIALOGSTR=$DIALOGSTR"   Used  $USED ($GBSIZE GB)\n"
-    GBSIZE=$(echo "scale=2; $FREESPACE/1024/1024/1024" | bc -l)
-    DIALOGSTR=$DIALOGSTR"   Free  $FREESPACE ($GBSIZE GB)\n\n"
-  done
-  if [ $(echo $DISKS | tr ' ' \\n | wc -l) -gt 1 ]; then
-    DIALOGSTR=$DIALOGSTR"Which of these disks you want to use?\n"
-    SLX_CHOOSEN_DISK=$(dialog --no-collapse --cr-wrap --inputbox "$DIALOGSTR" 0 0 $(echo $DISKS | cut -d ' ' -f1) 3>&1 1>&2 2>&3)
-    if [ $? -eq 1 ]; then
-      exit 1;
-    fi
-    # verify if the choosen disk is a valid disk
-    echo $DISKS | tr ' ' \\n | grep -e ^$SLX_CHOOSEN_DISK$ > /dev/null 2>/dev/null
-    while [ $? -ne 0 ]; do
-      dialog --msgbox "Invalid option.\nTry again." 0 0
-      SLX_CHOOSEN_DISK=$(dialog --no-collapse --cr-wrap --inputbox "$DIALOGSTR" 0 0 $(echo $DISKS | cut -d ' ' -f1) 3>&1 1>&2 2>&3)
-      if [ $? -eq 1 ]; then
-        exit 1;
-      fi
-      echo $DISKS | tr ' ' \\n | grep -e ^$SLX_CHOOSEN_DISK$ > /dev/null 2>/dev/null
-    done
-    # ask a confirmation (all your data will be lost etc)
-  elif [ $(echo $DISKS | tr ' ' \\n | wc -l) -eq 1 ]; then
-    SLX_CHOOSEN_DISK=$(echo $DISKS | tr ' ' \\n | head -n1)
-  else
-    dialog --msgbox "ERROR: Can't find an hard disk." 10 40
-    exit 1
-  fi
-fi
-if [ -z "$SLX_PARTITION_TABLE" ]; then
-  if [ $SLX_AUTOMATIC_PARTITIONING = "yes" ]; then
-    SLX_PARTITION_TABLE='     
-    44,10G,/tmp
-    45,10G,/var/scratch'
-  else
-    dialog --msgbox "ERROR: You didn't set a valid partition table. Please check your config file." 10 40
-    exit 1  
-  fi
-fi
-
-# if SLX_PARTITION_TABLE is set then put his content in a associative array
-declare -A PARTTBL
-COUNTER=1
-for PARTITION in $SLX_PARTITION_TABLE; do
-  IFS=,
-  set $PARTITION
-  if [ $COUNTER -eq 4 ]; then
-    COUNTER=$(($COUNTER+1))
-  fi
-  echo "id: $1"
-  PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/id"]=$1
-  shift
-  echo "size: $1"
-  PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/size"]=$(echo $1 | egrep -o "[0-9]*")
-  shift
-  if [ -n $1 ]; then
-    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/mountpoint"]=$1
-  fi
-  shift
-  if [[ "$*" == *bootable* ]]; then
-    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=1
-  else
-    PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/bootable"]=0
-  fi
-  # set the partitions to non-existents
-  PARTTBL["$SLX_CHOOSEN_DISK$COUNTER/exists"]=0
-  COUNTER=$(($COUNTER+1))
-done
-unset IFS
-# PARTTBL starts at 1 and ends at COUNTER-1
-
-# check if the choosen disk is greater than the new partition table size.
-DISKSIZE=$(($(cat $PARTITIONSPATH | grep -e $SLX_CHOOSEN_DISK$ | tr -s ' ' | cut -d ' ' -f4)*$BLOCKSIZE))
-NEEDED_SPACE=0
-for (( i = 1; i < $COUNTER; i++ )); do
-  if [[ $i -ne 4 ]]; then
-    NEEDED_SPACE=$(($NEEDED_SPACE+${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}))
-  fi
-done
-NEEDED_SPACE=$(($NEEDED_SPACE*1024*1024*1024+$COUNTER*1024*1024))
-if [ $DISKSIZE -lt $NEEDED_SPACE ]; then
-  dialog --msgbox "ERROR: Insufficient space in disk /dev/$SLX_CHOOSEN_DISK." 6 40
-  exit 1
-fi
-
-# choosing the partition type (MSDOS or GPT) if it wasn't set in config file
-if [ -z "$SLX_PARTITION_TYPE" ] && [ $SLX_DELETE_PARTITION_TABLE = "yes" ]; then
-  if [ $SLX_AUTOMATIC_PARTITIONING = "yes" ]; then
-    SLX_PARTITION_TYPE=msdos
-  else
-    ANS=$(dialog --no-tags --menu "Choose the partitions type" 0 0 0 "1" " MSDOS " "2" " GPT " 3>&1 1>&2 2>&3)
-    if [ $? -eq 1 ]; then
-      exit 1
-    fi
-    if [ $ANS -eq 1 ]; then
-      SLX_PARTITION_TYPE=msdos
-    else
-      SLX_PARTITION_TYPE=GPT
-    fi
-  fi
-fi
-
-GBSIZE=$(echo "scale=2; $DISKSIZE/1024/1024/1024" | bc -l)
-DIALOGSTR="$SLX_CHOOSEN_DISK  $DISKSIZE Bytes ($GBSIZE GB)\n"
-PARTS=$(cat $PARTITIONSPATH | grep -e $SLX_CHOOSEN_DISK[0-9] | tr -s ' ' | cut -d ' ' -f5)
-USED=0
-for PART in $PARTS; do
-  PARTSIZE=$(($(cat $PARTITIONSPATH | grep -e $PART$ | tr -s ' ' | cut -d ' ' -f4)*$BLOCKSIZE))
-  USED=$(($USED+$PARTSIZE))
-  GBSIZE=$(echo "scale=2; $PARTSIZE/1024/1024/1024" | bc -l)
-  DIALOGSTR=$DIALOGSTR"   $PART   $PARTSIZE ($GBSIZE GB)\n"
-done
-DIALOGSTR=$DIALOGSTR"   ----------\n"
-FREESPACE=$(($DISKSIZE-$USED))
-GBSIZE=$(echo "scale=2; $USED/1024/1024/1024" | bc -l)
-DIALOGSTR=$DIALOGSTR"   Used  $USED ($GBSIZE GB)\n"
-GBSIZE=$(echo "scale=2; $FREESPACE/1024/1024/1024" | bc -l)
-DIALOGSTR=$DIALOGSTR"   Free  $FREESPACE ($GBSIZE GB)\n\n"
-DIALOGSTR=$DIALOGSTR"All /dev/$SLX_CHOOSEN_DISK partitions will be deleted, ok?"
-
-# asking confirmation to create the partitions
-if [[ $SLX_AUTOMATIC_PARTITIONING = "no" && $SLX_DELETE_PARTITION_TABLE = 'yes' ]]; then
-  dialog --defaultno --yesno "$DIALOGSTR" 0 0
-  if [ $? -eq 1 ]; then
-    exit 1
-  fi
-fi
-
-# pick the size of a sector (usually 512 bytes)
-# SECTORSIZE=$(sfdisk /dev/$SLX_CHOOSEN_DISK -l -u S 2> /dev/null | grep Units | cut -d ' ' -f5)
-SECTORSIZE=512
-
-if [[ $USED -eq 0 ]]; then  
-  SLX_DELETE_PARTITION_TABLE="yes"
-fi
-
-if [ $SLX_DELETE_PARTITION_TABLE = "yes" ]; then
-  # delete partition table
-  sgdisk -Z /dev/$SLX_CHOOSEN_DISK > /dev/null 2> /dev/null # erase all partitions
-
-  if [ $SLX_PARTITION_TYPE = 'GPT' ]; then
-  	DIALOGSTR="Creating Partitions...\n\n"
-  	echo "0" | dialog --gauge "$DIALOGSTR" 0 0 0
-    for (( i = 1; i < $COUNTER; i++ )); do  # loop that will create each GPT partition, change GUIDS, change names, and set bootable flags.
-      if [ $i -ne 4 ]; then
-        sgdisk /dev/$SLX_CHOOSEN_DISK -n $i:0:+${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}G 2> /dev/null > /dev/null
-    		# dialog --msgbox "$DIALOGSTR" 0 0
-        if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "82" ] || [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "83" ]; then
-          sgdisk /dev/$SLX_CHOOSEN_DISK -t $i:${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}00
-        else
-          sgdisk /dev/$SLX_CHOOSEN_DISK -t $i:${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}000000-0000-0000-0000-000000000000\
-          sgdisk /dev/$SLX_CHOOSEN_DISK -c $i:\"${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}\" >/dev/null 2>/dev/null
-        fi
-        if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/bootable"]} -eq 1 ]; then
-          # set the bootable flag
-        	sgdisk /dev/$SLX_CHOOSEN_DISK -A $i:set:2 >/dev/null 2>/dev/null
-        fi
-        SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
-        ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
-        MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
-        DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"$SLX_CHOOSEN_DISK$i")\n"
-        if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "82" ]; then
-          DIALOGSTR=$DIALOGSTR"   GUID: 0657FD6D-A4AB-43C4-84E5-0933C84B4F4F\n"
-        elif [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "83" ]; then
-          DIALOGSTR=$DIALOGSTR"   GUID: 0FC63DAF-8483-4772-8E79-3D69D8477DE4\n"
-        else
-          DIALOGSTR=$DIALOGSTR"   GUID: "$ID"000000-0000-0000-0000-000000000000\n"
-        fi
-        DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
-        echo $(( $i*100/($COUNTER-1) )) | dialog --gauge "$DIALOGSTR" 0 0 0
-      fi
-    done
-  else
-    # constructing the sfdisk input file
-    echo "unit: sectors
-    "> /tmp/partitiontable.tmp
-
-    START=$((1*1024*1024/$SECTORSIZE))
-    for (( i = 1; i < $COUNTER; i++ )); do
-      if [ $i -ne 4 ]; then
-        SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024/$SECTORSIZE))
-        ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
-        if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/bootable"]} -eq 1 ]; then
-          echo "/dev/"$SLX_CHOOSEN_DISK$i" : start= "$START", size= "$SIZE", Id= "$ID", bootable " >> /tmp/partitiontable.tmp
-        else
-          echo "/dev/"$SLX_CHOOSEN_DISK$i" : start= "$START", size= "$SIZE", Id= "$ID >> /tmp/partitiontable.tmp
-        fi
-        START=$(($START+$SIZE+1*1024*1024/$SECTORSIZE))
-      else
-        echo "/dev/"$SLX_CHOOSEN_DISK$i" : start= "$START", size= "$(($DISKSIZE/$SECTORSIZE-1))", Id= 5" >> /tmp/partitiontable.tmp
-        START=$(($START+1*1024*1024/$SECTORSIZE))
-      fi
-    done
-    sfdisk -q -f /dev/$SLX_CHOOSEN_DISK < /tmp/partitiontable.tmp > /dev/null 2> /dev/null
-    # rm -f /tmp/partitiontable.tmp
-
-  	DIALOGSTR="Creating Partitions...\n\n"
-    for (( i = 1; i < $COUNTER; i++ )); do
-      if [ $i -lt 4 ]; then
-        SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
-        ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
-        MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
-        DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"$SLX_CHOOSEN_DISK$i")\n"
-        DIALOGSTR=$DIALOGSTR"   Type: Primary\n"
-        DIALOGSTR=$DIALOGSTR"   ID: "$ID"\n"
-        DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
-      elif [ $i -gt 4 ]; then
-        SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
-        ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
-        MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
-        DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"$SLX_CHOOSEN_DISK$i")\n"
-        DIALOGSTR=$DIALOGSTR"   Type: Logical\n"
-        DIALOGSTR=$DIALOGSTR"   ID: "$ID"\n"
-        DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
-      fi
-    done
-  fi
-elif [ $(sfdisk -d /dev/$SLX_CHOOSEN_DISK 2> /dev/null | grep $SLX_CHOOSEN_DISK'1' | tr -s ' ' | cut -d ' ' -f7 | cut -d '=' -f2) = 'ee' ]; then
-# finding existent partitions in GPT
-  echo 'GPT'
-  NONEXISTENT_PARTITIONS=0
-  for (( i = 1; i < $COUNTER; i++ )); do
-    if [ $i -ne 4 ]; then
-			for PART in $PARTS; do
-        if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "82" ]; then
-          sgdisk /dev/$SLX_CHOOSEN_DISK -i ${PART:3} 2> /dev/null | grep "0657FD6D-A4AB-43C4-84E5-0933C84B4F4F" > /dev/null
-        elif [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "83" ]; then
-          sgdisk /dev/$SLX_CHOOSEN_DISK -i ${PART:3} 2> /dev/null | grep "0FC63DAF-8483-4772-8E79-3D69D8477DE4" > /dev/null
-        else
-          sgdisk /dev/$SLX_CHOOSEN_DISK -i ${PART:3} 2> /dev/null | grep ${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}"000000-0000-0000-0000-000000000000" > /dev/null
-        fi
-        if [ $? -eq 0 ]; then
-          PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]=$PART
-          NEEDED_SPACE=$(($NEEDED_SPACE-${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
-          break
-        fi
-  		done
-  		if [[ ${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]} = "0" ]]; then
-	    	NONEXISTENT_PARTITIONS=$(($NONEXISTENT_PARTITIONS+1))
-  		fi
-    fi
-  done
-  # checking if there's sufficient space for the new partitions.
-  if [[ $FREESPACE -lt $NEEDED_SPACE ]]; then
-    dialog --msgbox "ERROR: Insufficient free space in disk /dev/$SLX_CHOOSEN_DISK." 6 40
-    exit 1
-  fi
-  if [[ $NONEXISTENT_PARTITIONS -eq 0 ]]; then
-  	DIALOGSTR="All your requested partitions already exists.\n\n"
-  	DIALOGSTR=$DIALOGSTR"Partition    ID\n"
-	  for (( i = 1; i < $COUNTER; i++ )); do
-	  	if [[ $i -ne 4 ]]; then
-	  		DIALOGSTR=$DIALOGSTR"${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]}         ${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}\n"
-	  	fi
-	  done
-	else
-	  DIALOGSTR="Creating partitions...\n\n"
-	  echo "0" | dialog --gauge "$DIALOGSTR" 0 0 0
-    CREATED=0
-	  for (( i = 1; i < $COUNTER; i++ )); do
-	    j=1
-	    if [[ $i -ne 4 ]]; then
-		    if [[ "${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]}" = "0" ]]; then
-		      sgdisk /dev/$SLX_CHOOSEN_DISK -n $j:0:+${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}G 2> /dev/null > /dev/null
-		      while [[ $? -eq 4 ]]; do
-		        j=$(($j+1))
-		        sgdisk /dev/$SLX_CHOOSEN_DISK -n $j:0:+${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}G 2> /dev/null > /dev/null
-		      done
-		      PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]=$SLX_CHOOSEN_DISK$j
-		      SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
-		      ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
-		      MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
-		      DIALOGSTR=$DIALOGSTR$MOUNTPOINT" (/dev/"${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]}")\n"
-		      if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "82" ]; then
-		        DIALOGSTR=$DIALOGSTR"   GUID: 0657FD6D-A4AB-43C4-84E5-0933C84B4F4F\n"
-		      elif [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "83" ]; then
-		        DIALOGSTR=$DIALOGSTR"   GUID: 0FC63DAF-8483-4772-8E79-3D69D8477DE4\n"
-		      else
-		      	sgdisk /dev/$SLX_CHOOSEN_DISK -t $j:$ID"000000-0000-0000-0000-000000000000" -c $j:$MOUNTPOINT >/dev/null 2>/dev/null
-		        DIALOGSTR=$DIALOGSTR"   GUID: "$ID"000000-0000-0000-0000-000000000000\n"
-		      fi
-		      DIALOGSTR=$DIALOGSTR"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
-		      CREATED=$(($CREATED+1))
-	      	echo $(( $CREATED*100/($NONEXISTENT_PARTITIONS) )) | dialog --gauge "$DIALOGSTR" 0 0 0
-		    fi
-	      if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/bootable"]} -eq 1 ]; then
-	      	sgdisk /dev/$SLX_CHOOSEN_DISK -A $j:set:2 >/dev/null 2>/dev/null
-	      fi
-	    fi
-	  done
-  fi
-else
-# finding existent partitions in MS-DOS
-  echo 'MSDOS'
-  for PART in $PARTS; do
-    for (( i = 1; i < $COUNTER; i++ )); do
-      if [ $i -ne 4 ]; then
-        if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]} = 0 ]; then
-          sfdisk -d /dev/$SLX_CHOOSEN_DISK 2> /dev/null | grep $PART | tr -s ' ' | cut -d ' ' -f7 | grep ${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]} > /dev/null
-          if [ $? -eq 0 ]; then
-            echo "the partition $PART is the ${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]} partition."
-            PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]=$PART
-            NEEDED_SPACE=$(($NEEDED_SPACE-${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
-            break
-          fi
-        fi
-      fi
-    done
-  done
-  echo "FREESPACE="$FREESPACE
-  echo "NEEDED_SPACE="$NEEDED_SPACE
-  if [[ $FREESPACE -lt $NEEDED_SPACE ]]; then
-    dialog --msgbox "ERROR: Insufficient free space in disk /dev/$SLX_CHOOSEN_DISK." 6 40
-    exit 1
-  fi
-fi
-DIALOGSTR=${DIALOGSTR/Creating Partitions.../New partitions created:}
-dialog --msgbox "$DIALOGSTR" 0 0
diff --git a/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner b/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner
new file mode 100755
index 00000000..11a1952d
--- /dev/null
+++ b/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner
@@ -0,0 +1,482 @@
+#!/bin/ash
+# Copyright (c) 2013 - OpenSLX GmbH
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your feedback to feedback@openslx.org
+#
+# General information about OpenSLX can be found under http://openslx.org
+#
+# Local hard disk autodetection script for OpenSLX linux stateless clients,
+# detecting swap and special partitions
+
+#############################################################################
+
+. /opt/openslx/config || { echo "Could not source config."; exit 23; }
+
+#set -x
+#exec > /log 2>&1
+
+#--------------------------------------------------------------------------------------
+#Gathering partition information
+
+# BLOCKSIZE=$(sfdisk -l /dev/$SLX_CHOOSEN_DISK | grep -o -e "blocks of [0-9]* bytes" | cut -d ' ' -f3)
+BLOCKSIZE=1024
+
+# pick the size of a sector (usually 512 bytes)
+# SECTORSIZE=$(sfdisk /dev/$SLX_CHOOSEN_DISK -l -u S 2> /dev/null | grep Units | cut -d ' ' -f5)
+SECTORSIZE=512
+
+# Partition that should be set as extended partition (only partitions 2-4 can be extended partitions)
+EXTENDED_PARTITION_NR=4
+
+PARTITIONSPATH="/proc/partitions"
+# picking disk that will be used
+DISKS=$(cat $PARTITIONSPATH | tr -s ' ' | cut -d ' ' -f5 | grep -e "[a-z]$")
+if [ -z "$DISKS" ]; then
+  if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
+    dialog --title "ERROR" --stdout --msgbox "Can't find an hard disk." 10 40
+  else
+    echo "ERROR: Can't find an hard disk." 1>&2
+  fi
+  exit 1
+fi
+#--------------------------------------------------------------------------------------
+
+define_partition_table() {
+  if [ -z "$SLX_PARTITION_TABLE" ]; then
+    SLX_PARTITION_TABLE='
+    44,1G,/tmp
+    45,1G,/var/scratch'
+    echo "INFO: You didn't define a partition table in config. Using default partition table:\n$SLX_PARTITION_TABLE" 1>&2
+    if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
+      dialog --title "INFO" --stdout --msgbox "You didn't define a partition table in config. Using default partition table:\n$SLX_PARTITION_TABLE" 10 40
+    fi
+  fi
+}
+
+size_conv() {
+  [ $(echo "$1<1024" | bc) -eq 1 ] && { echo "$1 B"; exit 0; }
+  local result="$(echo $1 | awk '{ sum=$1; hum[1024^3]="GB"; hum[1024^2]="MB"; hum[1024]="KB";
+                    for (x=1024^3; x>=1024; x/=1024){
+                      if (sum>=x) { printf "%.2f %s\n",sum/x,hum[x]; break }
+                    }
+                 }')"
+  echo $result
+}
+
+choose_disk() {
+  local disk_number=$(echo $DISKS | tr ' ' \\n           | wc -l)
+  if [ "$SLX_AUTOMATIC_PARTITIONING" = "yes" ]; then
+    if [ -n "$SLX_CHOOSEN_DISK" ]; then
+      echo $DISKS | grep -wq "$SLX_CHOOSEN_DISK" || { echo "ERROR: Automatic partitioning enabled, but in config specified $SLX_CHOOSEN_DISK was not found." 1>&2; return 1; }
+    elif [ "$disk_number" -eq 1 ]; then
+      SLX_CHOOSEN_DISK=$DISKS
+      echo "INFO: Automatic partitioning enabled, but SLX_CHOOSEN_DISK not specified in config. Choosing only existing disk: $DISKS for partitioning." 1>&2
+    else
+      echo "ERROR: Automatic partitioning enabled, but SLX_CHOOSEN_DISK not specified in config. More than one disk exists, please specify disk in config and run again." 1>&2
+      return 1
+    fi
+  else
+    local dialog_string="Existing disks with partition tables:\n\n"
+    local disksize=""
+    local freespace=0
+    local parts=""
+    local partsize=0
+    local used=0
+    local options=""
+
+    for disk in $DISKS; do
+      disksize=$(echo "$(cat $PARTITIONSPATH | grep -e $disk$ | tr -s ' ' | cut -d ' ' -f4)*$BLOCKSIZE" | bc)
+      parts=$(cat $PARTITIONSPATH | grep -e $disk[0-9] | tr -s ' ' | cut -d ' ' -f5)
+      dialog_string="${dialog_string}$disk     $(size_conv $disksize)\n"
+      used=0
+      options="${options}$disk $disk "
+
+      for part in $parts; do
+        partsize=$(echo "$(cat $PARTITIONSPATH | grep -e $part$ | tr -s ' ' | cut -d ' ' -f4)*$BLOCKSIZE" | bc)
+        used=$(echo "$used+$partsize" | bc)
+        dialog_string="${dialog_string} $part   $(size_conv $partsize)\n"
+      done
+
+      dialog_string=$dialog_string"--------------------------------\n"
+      freespace=$(echo "$disksize-$used" | bc)
+      dialog_string="${dialog_string}Used    $(size_conv $used)\n"
+      dialog_string="${dialog_string}Free    $(size_conv $freespace)\n\n"
+    done
+
+    if [ $(echo $DISKS | tr ' ' \\n           | wc -l) -gt 0 ]; then
+      SLX_CHOOSEN_DISK=$(echo $options | xargs dialog --title "Choose a disk to partition:" --no-tags --cr-wrap --no-collapse --stdout --menu "${dialog_string}" 0 0 0)
+      if [ -z $SLX_CHOOSEN_DISK ]; then
+        echo "INFO: Partitioning aborted by user." 1>&2
+        return 1
+      fi
+    else
+      dialog --title "ERROR" --stdout --msgbox "Can't find a hard disk." 10 40
+      return 2
+    fi
+  fi
+  CHOOSEN_DISK_SIZE=$(echo "$(cat $PARTITIONSPATH | grep -e $SLX_CHOOSEN_DISK$ | tr -s ' ' | cut -d ' ' -f4)*$BLOCKSIZE" | bc)
+  CHOOSEN_DISK_PARTS=$(cat $PARTITIONSPATH | grep -e $SLX_CHOOSEN_DISK[0-9] | tr -s ' ' | cut -d ' ' -f5)
+}
+
+check_disk_size() {
+  # check if the choosen disk is greater than the new partition table size.
+  local part_number=$(echo $SLX_PARTITION_TABLE | wc -w)
+  local part_space=$(echo $SLX_PARTITION_TABLE | grep -oE '[0-9]+G' | awk '{ SUM += $0 } END { print SUM }')
+  NEEDED_DISK_SPACE=$(echo "$part_space*1024*1024*1024+$part_number*1024*1024" | bc)
+
+  if [ $(echo "$CHOOSEN_DISK_SIZE<$NEEDED_DISK_SPACE" | bc) -eq 1 ]; then
+    echo "ERROR: Insufficient space on disk /dev/$SLX_CHOOSEN_DISK\n  DISK SIZE: $(size_conv $CHOOSEN_DISK_SIZE)\n  REQUIRED SIZE: $(size_conv $NEEDED_DISK_SPACE)" 1>&2
+    if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
+      dialog --title "ERROR" --stdout --msgbox "Insufficient space on disk /dev/$SLX_CHOOSEN_DISK\n  DISK SIZE: $(size_conv $CHOOSEN_DISK_SIZE)\n  REQUIRED SIZE: $(size_conv $NEEDED_DISK_SPACE) " 6 40
+    fi
+    return 1
+  fi
+}
+
+select_partition_type() {
+  # choosing the partition type (MSDOS or GPT) if it wasn't set in config file
+  if [ -z "$SLX_PARTITION_TYPE" ]; then
+    if [ "$SLX_AUTOMATIC_PARTITIONING" = "yes" ]; then
+      echo "INFO: SLX_PARTITION_TYPE not defined in config, using default: msdos" 1>&2
+      SLX_PARTITION_TYPE=msdos
+    else
+      SLX_PARTITION_TYPE=$(dialog --no-tags --title "Choose a partition type:" --menu --stdout "Partitions types:" 0 0 0 "msdos" " MSDOS " "GPT" " GPT ")
+      if [ -z $SLX_PARTITION_TYPE ]; then
+        echo "INFO: Partitioning aborted by user." 1>&2
+        return 1
+      fi
+    fi
+  fi
+}
+
+confirm_partitioning() {
+  local dialog_string="New partition table after partitioning:\n\n"
+  local counter=1
+  local id=0
+  local size=0
+  local mountpoint=""
+  local bootable=0
+  local part_type="Primary"
+  for part in $SLX_PARTITION_TABLE; do
+    IFS=,
+    set $part
+
+    id=$1
+    shift
+    size=${1%G}
+    shift
+    [ -n $1 ] && mountpoint=$1
+    shift
+    case "$*" in
+      *bootable*) bootable=1 ;;
+               *) bootable=0 ;;
+    esac
+
+    [ "$id" = "82" ] && mountpoint="swap"
+
+    if [ $SLX_PARTITION_TYPE = 'GPT' ]; then
+      #update dialog status
+      dialog_string="${dialog_string}${mountpoint} (/dev/"${SLX_CHOOSEN_DISK}${counter}")\n"
+      if [ "${id}" = "82" ]; then
+        dialog_string="${dialog_string}   GUID: 0657FD6D-A4AB-43C4-84E5-0933C84B4F4F\n"
+      elif [ "${id}" = "83" ]; then
+        dialog_string="${dialog_string}   GUID: 0FC63DAF-8483-4772-8E79-3D69D8477DE4\n"
+      else
+        dialog_string="${dialog_string}   GUID: "$id"000000-0000-0000-0000-000000000000\n"
+      fi
+      dialog_string="${dialog_string}   Size: "$size" GB\n"
+    else
+      if [ $counter -eq $EXTENDED_PARTITION_NR ]; then
+        part_type="Logical"
+        counter=$(($counter+1))
+      fi
+      #update dialog
+      dialog_string="${dialog_string}$mountpoint (/dev/${SLX_CHOOSEN_DISK}$counter)\n"
+      dialog_string="${dialog_string}   Type: $part_type\n"
+      dialog_string="${dialog_string}   ID: $id\n"
+      dialog_string="${dialog_string}   Size: $size GB\n"
+    fi
+
+    counter=$(($counter+1))
+  done
+  unset IFS
+
+  dialog_string="${dialog_string}\nAll existing partitions on /dev/$SLX_CHOOSEN_DISK will be deleted, continue?"
+
+  # asking confirmation to create the partitions
+  dialog --title "WARNING" --stdout --defaultno --yesno "$dialog_string" 0 0
+  if [ $? -eq 1 ]; then
+    echo "INFO: Partitioning aborted by user." 1>&2
+    return 1
+  fi
+}
+
+# function to create gpt type partition tables (uses sgdisk)
+partition_disk_gpt() {
+  # delete partition table
+  sgdisk -Z /dev/$SLX_CHOOSEN_DISK > /dev/null 2>&1 # erase all partitions
+
+  #set dialog
+  if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
+    dialog_string="New partitions created:\n\n"
+    echo "0" | dialog --stdout --gauge "$dialog_string" 0 0 0
+  fi
+
+  # loop that will create each GPT partition, change GUIDS, change names, and set bootable flags.
+  local counter=1
+  local part_number=$(echo $SLX_PARTITION_TABLE | wc -w)
+  local id=0
+  local size=0
+  local mountpoint=""
+  local bootable=0
+  for part in $SLX_PARTITION_TABLE; do
+    IFS=,
+    set $part
+
+    id=$1
+    shift
+    size=${1%G}
+    shift
+    [ -n $1 ] && mountpoint=$1
+    shift
+    case "$*" in
+      *bootable*) bootable=1 ;;
+               *) bootable=0 ;;
+    esac
+
+    #set size of partition
+    sgdisk /dev/${SLX_CHOOSEN_DISK} -n ${counter}:0:+${size}G 1>&2
+
+    #set id of partition
+    if [ "${id}" = "82" ] || [ "${id}" = "83" ]; then
+      sgdisk /dev/${SLX_CHOOSEN_DISK} -t ${counter}:${id}00 1>&2
+    else
+      sgdisk /dev/${SLX_CHOOSEN_DISK} -t ${counter}:${id}000000-0000-0000-0000-000000000000 -c ${counter}:\"${mountpoint}\" 1>&2
+    fi
+
+    #set boot flag
+    if [ "$bootable" -eq 1 ]; then
+      sgdisk /dev/${SLX_CHOOSEN_DISK} -A ${counter}:set:2 1>&2
+    fi
+
+    if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
+      #update dialog status
+      [ "$id" = "82" ] && mountpoint="swap"
+      dialog_string="${dialog_string}${mountpoint} (/dev/"${SLX_CHOOSEN_DISK}${counter}")\n"
+      if [ "${id}" = "82" ]; then
+        dialog_string="${dialog_string}   GUID: 0657FD6D-A4AB-43C4-84E5-0933C84B4F4F\n"
+      elif [ "${id}" = "83" ]; then
+        dialog_string="${dialog_string}   GUID: 0FC63DAF-8483-4772-8E79-3D69D8477DE4\n"
+      else
+        dialog_string="${dialog_string}   GUID: "$id"000000-0000-0000-0000-000000000000\n"
+      fi
+      dialog_string="${dialog_string}   Size: "$size" GB\n"
+      echo $(echo "(100/$part_number)*$counter" | bc) | dialog --stdout --gauge "${dialog_string}" 0 0 0
+    fi
+
+    counter=$(($counter+1))
+  done
+  unset IFS
+
+  if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
+    dialog --title "Creating partitions..." --stdout --msgbox "$dialog_string" 0 0
+  fi
+}
+
+#function to create msdos type partition tables (uses sfdisk)
+partition_disk_msdos(){
+  # delete partition table
+  sgdisk -Z /dev/$SLX_CHOOSEN_DISK > /dev/null 2>&1 # erase all partitions
+
+  #set dialog
+  dialog_string="New partitions created:\n\n"
+
+  # constructing the sfdisk input file
+  echo "unit: sectors"> /tmp/partitiontable.tmp
+
+  # loop that will create each GPT partition, change GUIDS, change names, and set bootable flags.
+  local counter=1
+  local id=0
+  local size=0
+  local mountpoint=""
+  local bootable=0
+  local part_type="Primary"
+  local start=$(echo "1*1024*1024/$SECTORSIZE" | bc)
+  for part in $SLX_PARTITION_TABLE; do
+    IFS=,
+    set $part
+
+    id=$1
+    shift
+    size=${1%G}
+    shift
+    [ -n $1 ] && mountpoint=$1
+    shift
+    case "$*" in
+      *bootable*) bootable=1 ;;
+               *) bootable=0 ;;
+    esac
+
+    if [ $counter -eq $EXTENDED_PARTITION_NR ]; then
+      echo "/dev/${SLX_CHOOSEN_DISK}$counter : start= $start, size= $(echo "${CHOOSEN_DISK_SIZE}/$SECTORSIZE-1" | bc), Id= 5" >> /tmp/partitiontable.tmp
+      part_type="Logical"
+      start=$(echo "$start+1*1024*1024/$SECTORSIZE" | bc)
+      counter=$(($counter+1))
+    fi
+
+    size_bytes=$(echo "${size}*1024*1024*1024/$SECTORSIZE" | bc)
+
+    if [ "$bootable" -eq 1 ]; then
+       echo "/dev/${SLX_CHOOSEN_DISK}$counter : start= $start, size= $size_bytes, Id= $id, bootable " >> /tmp/partitiontable.tmp
+    else
+       echo "/dev/${SLX_CHOOSEN_DISK}$counter : start= $start, size= $size_bytes, Id= $id" >> /tmp/partitiontable.tmp
+    fi
+
+    start=$(echo "$start+$size_bytes+1*1024*1024/$SECTORSIZE" |bc)
+
+    #update dialog
+    [ "$id" = "82" ] && mountpoint="swap"
+    dialog_string="${dialog_string}$mountpoint (/dev/${SLX_CHOOSEN_DISK}$counter)\n"
+    dialog_string="${dialog_string}   Type: $part_type\n"
+    dialog_string="${dialog_string}   ID: $id\n"
+    dialog_string="${dialog_string}   Size: $size GB\n"
+
+    counter=$(($counter+1))
+  done
+  unset IFS
+
+  sfdisk -q --no-reread -f /dev/${SLX_CHOOSEN_DISK} < /tmp/partitiontable.tmp 1>&2
+  # rm -f /tmp/partitiontable.tmp
+
+  if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
+    dialog --title "Creating partitions..." --stdout --msgbox "$dialog_string" 0 0
+  fi
+}
+
+
+define_partition_table || exit 1;
+choose_disk || exit 1;
+select_partition_type || exit 1;
+if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
+  confirm_partitioning || exit 1;
+fi
+check_disk_size || exit 1;
+
+if [ $SLX_PARTITION_TYPE = 'GPT' ]; then
+  partition_disk_gpt || { echo "Error while writing GPT partition table to disk" 1>&2; exit 1; }
+else
+  partition_disk_msdos || { echo "Error while writing msdos partition table to disk" 1>&2; exit 1; }
+fi
+
+if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
+  #reboot prompt
+  dialog --title "reboot computer" --stdout --yes-label "Reboot" --no-label "Continue" --yesno "For changes to take effect you have to reboot your machine." 5 65
+  [ $? -eq 0 ] && reboot || exit 0
+else
+  reboot
+fi
+
+####################### CODE FOR THE PRESERVATION OF EXISTING PARTITIONS (EXPERIMENTAL) #########################
+#elif [ $(sfdisk -d /dev/$SLX_CHOOSEN_DISK 2> /dev/null | grep $SLX_CHOOSEN_DISK'1' | tr -s ' ' | cut -d ' ' -f7 | cut -d '=' -f2) = 'ee' ]; then
+## finding existent partitions in GPT
+#  echo 'GPT'
+#  NONEXISTENT_PARTITIONS=0
+#  for (( i = 1; i < $COUNTER; i++ )); do
+#    if [ $i -ne 4 ]; then
+#			for PART in $PARTS; do
+#        if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "82" ]; then
+#          sgdisk /dev/$SLX_CHOOSEN_DISK -i ${PART:3} 2> /dev/null | grep "0657FD6D-A4AB-43C4-84E5-0933C84B4F4F" > /dev/null
+#        elif [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "83" ]; then
+#          sgdisk /dev/$SLX_CHOOSEN_DISK -i ${PART:3} 2> /dev/null | grep "0FC63DAF-8483-4772-8E79-3D69D8477DE4" > /dev/null
+#        else
+#          sgdisk /dev/$SLX_CHOOSEN_DISK -i ${PART:3} 2> /dev/null | grep ${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}"000000-0000-0000-0000-000000000000" > /dev/null
+#        fi
+#        if [ $? -eq 0 ]; then
+#          PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]=$PART
+#          NEEDED_SPACE=$(($NEEDED_SPACE-${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
+#          break
+#        fi
+#  		done
+#  		if [[ ${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]} = "0" ]]; then
+#	    	NONEXISTENT_PARTITIONS=$(($NONEXISTENT_PARTITIONS+1))
+#  		fi
+#    fi
+#  done
+#  # checking if there's sufficient space for the new partitions.
+#  if [[ $FREESPACE -lt $NEEDED_SPACE ]]; then
+#    dialog --msgbox "ERROR: Insufficient free space in disk /dev/$SLX_CHOOSEN_DISK." 6 40
+#    exit 1
+#  fi
+#  if [[ $NONEXISTENT_PARTITIONS -eq 0 ]]; then
+#  	dialog_string="All your requested partitions already exists.\n\n"
+#  	dialog_string=$dialog_string"Partition    ID\n"
+#	  for (( i = 1; i < $COUNTER; i++ )); do
+#	  	if [[ $i -ne 4 ]]; then
+#	  		dialog_string=$dialog_string"${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]}         ${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}\n"
+#	  	fi
+#	  done
+#	else
+#	  dialog_string="Creating partitions...\n\n"
+#	  echo "0" | dialog --gauge "$dialog_string" 0 0 0
+#    CREATED=0
+#	  for (( i = 1; i < $COUNTER; i++ )); do
+#	    j=1
+#	    if [[ $i -ne 4 ]]; then
+#		    if [[ "${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]}" = "0" ]]; then
+#		      sgdisk /dev/$SLX_CHOOSEN_DISK -n $j:0:+${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}G 2> /dev/null > /dev/null
+#		      while [[ $? -eq 4 ]]; do
+#		        j=$(($j+1))
+#		        sgdisk /dev/$SLX_CHOOSEN_DISK -n $j:0:+${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}G 2> /dev/null > /dev/null
+#		      done
+#		      PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]=$SLX_CHOOSEN_DISK$j
+#		      SIZE=$((${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
+#		      ID=${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}
+#		      MOUNTPOINT=${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]}
+#		      dialog_string=$dialog_string$MOUNTPOINT" (/dev/"${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]}")\n"
+#		      if [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "82" ]; then
+#		        dialog_string=$dialog_string"   GUID: 0657FD6D-A4AB-43C4-84E5-0933C84B4F4F\n"
+#		      elif [ "${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]}" = "83" ]; then
+#		        dialog_string=$dialog_string"   GUID: 0FC63DAF-8483-4772-8E79-3D69D8477DE4\n"
+#		      else
+#		      	sgdisk /dev/$SLX_CHOOSEN_DISK -t $j:$ID"000000-0000-0000-0000-000000000000" -c $j:$MOUNTPOINT >/dev/null 2>/dev/null
+#		        dialog_string=$dialog_string"   GUID: "$ID"000000-0000-0000-0000-000000000000\n"
+#		      fi
+#		      dialog_string=$dialog_string"   Size: "$SIZE" Bytes ("${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}" GB)\n"
+#		      CREATED=$(($CREATED+1))
+#	      	echo $(( $CREATED*100/($NONEXISTENT_PARTITIONS) )) | dialog --gauge "$dialog_string" 0 0 0
+#		    fi
+#	      if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/bootable"]} -eq 1 ]; then
+#	      	sgdisk /dev/$SLX_CHOOSEN_DISK -A $j:set:2 >/dev/null 2>/dev/null
+#	      fi
+#	    fi
+#	  done
+#  fi
+#else
+## finding existent partitions in MS-DOS
+#  echo 'MSDOS'
+#  for PART in $PARTS; do
+#    for (( i = 1; i < $COUNTER; i++ )); do
+#      if [ $i -ne 4 ]; then
+#        if [ ${PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]} = 0 ]; then
+#          sfdisk -d /dev/$SLX_CHOOSEN_DISK 2> /dev/null | grep $PART | tr -s ' ' | cut -d ' ' -f7 | grep ${PARTTBL["$SLX_CHOOSEN_DISK$i/id"]} > /dev/null
+#          if [ $? -eq 0 ]; then
+#            echo "the partition $PART is the ${PARTTBL["$SLX_CHOOSEN_DISK$i/mountpoint"]} partition."
+#            PARTTBL["$SLX_CHOOSEN_DISK$i/exists"]=$PART
+#            NEEDED_SPACE=$(($NEEDED_SPACE-${PARTTBL["$SLX_CHOOSEN_DISK$i/size"]}*1024*1024*1024))
+#            break
+#          fi
+#        fi
+#      fi
+#    done
+#  done
+#  echo "FREESPACE="$FREESPACE
+#  echo "NEEDED_SPACE="$NEEDED_SPACE
+#  if [[ $FREESPACE -lt $NEEDED_SPACE ]]; then
+#    dialog --msgbox "ERROR: Insufficient free space in disk /dev/$SLX_CHOOSEN_DISK." 6 40
+#    exit 1
+#  fi
+#fi
-- 
cgit v1.2.3-55-g7522


From 887369366fd1ac9252845bb8ffb0ffe27957e51d Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Fri, 10 Oct 2014 15:48:12 -0300
Subject: [partitioner] updated default partition table for partitioner and
 setup-partitions

---
 .../rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions | 2 +-
 server/modules/partitioner/opt/openslx/scripts/systemd-partitioner   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'server/modules')

diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
index b18a97d5..8fc7535c 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
@@ -137,7 +137,7 @@ read_partitions () {
 if [ -z "${SLX_PARTITION_TABLE}" ]; then
 	SLX_PARTITION_TABLE='
 		44,10G,/tmp
-		45,10G,/var/scratch,persistent
+		45,10G,/var/scratch
 		82,4G'
 fi
 
diff --git a/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner b/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner
index 11a1952d..ac1875d8 100755
--- a/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner
+++ b/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner
@@ -48,8 +48,9 @@ fi
 define_partition_table() {
   if [ -z "$SLX_PARTITION_TABLE" ]; then
     SLX_PARTITION_TABLE='
-    44,1G,/tmp
-    45,1G,/var/scratch'
+    44,10G,/tmp
+    45,10G,/var/scratch
+    82,4G'
     echo "INFO: You didn't define a partition table in config. Using default partition table:\n$SLX_PARTITION_TABLE" 1>&2
     if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
       dialog --title "INFO" --stdout --msgbox "You didn't define a partition table in config. Using default partition table:\n$SLX_PARTITION_TABLE" 10 40
-- 
cgit v1.2.3-55-g7522


From 8ee20e54090b49ee50303d09ce482f9db8c43550 Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Mon, 13 Oct 2014 16:53:42 -0300
Subject: [partitioner] Create function for warning and error messages

---
 .../opt/openslx/scripts/systemd-partitioner        | 133 +++++++++++----------
 1 file changed, 70 insertions(+), 63 deletions(-)

(limited to 'server/modules')

diff --git a/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner b/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner
index ac1875d8..f8b7b819 100755
--- a/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner
+++ b/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner
@@ -14,11 +14,33 @@
 
 #############################################################################
 
-. /opt/openslx/config || { echo "Could not source config."; exit 23; }
+perror () {
+  echo "ERROR: $@" 1>&2
+  if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
+    dialog --title "ERROR" --stdout --msgbox "$@" 15 60
+  else
+    dialog --title "ERROR" --no-cancel --stdout --pause "$@\n\nReboot in:" 15 60 600
+    reboot
+  fi
+  exit 1
+}
+
+pwarning  () {
+  echo "WARNING: $@" 1>&2
+  if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
+    dialog --title "WARNING" --stdout --msgbox "$@" 15 60
+  else
+    dialog --title "WARNING" --stdout --infobox "$@" 15 60
+    sleep 5
+  fi
+}
+
+. /opt/openslx/config || perror "Could not source config."
 
 #set -x
 #exec > /log 2>&1
 
+
 #--------------------------------------------------------------------------------------
 #Gathering partition information
 
@@ -36,12 +58,7 @@ PARTITIONSPATH="/proc/partitions"
 # picking disk that will be used
 DISKS=$(cat $PARTITIONSPATH | tr -s ' ' | cut -d ' ' -f5 | grep -e "[a-z]$")
 if [ -z "$DISKS" ]; then
-  if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
-    dialog --title "ERROR" --stdout --msgbox "Can't find an hard disk." 10 40
-  else
-    echo "ERROR: Can't find an hard disk." 1>&2
-  fi
-  exit 1
+  perror "Can't find an hard disk."
 fi
 #--------------------------------------------------------------------------------------
 
@@ -51,10 +68,7 @@ define_partition_table() {
     44,10G,/tmp
     45,10G,/var/scratch
     82,4G'
-    echo "INFO: You didn't define a partition table in config. Using default partition table:\n$SLX_PARTITION_TABLE" 1>&2
-    if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
-      dialog --title "INFO" --stdout --msgbox "You didn't define a partition table in config. Using default partition table:\n$SLX_PARTITION_TABLE" 10 40
-    fi
+    pwarning "You didn't define a partition table in config. Using default partition table:\n$SLX_PARTITION_TABLE"
   fi
 }
 
@@ -72,13 +86,12 @@ choose_disk() {
   local disk_number=$(echo $DISKS | tr ' ' \\n           | wc -l)
   if [ "$SLX_AUTOMATIC_PARTITIONING" = "yes" ]; then
     if [ -n "$SLX_CHOOSEN_DISK" ]; then
-      echo $DISKS | grep -wq "$SLX_CHOOSEN_DISK" || { echo "ERROR: Automatic partitioning enabled, but in config specified $SLX_CHOOSEN_DISK was not found." 1>&2; return 1; }
+      echo $DISKS | grep -wq "$SLX_CHOOSEN_DISK" || perror "ERROR: Automatic partitioning enabled, but in config specified $SLX_CHOOSEN_DISK was not found." 
     elif [ "$disk_number" -eq 1 ]; then
       SLX_CHOOSEN_DISK=$DISKS
-      echo "INFO: Automatic partitioning enabled, but SLX_CHOOSEN_DISK not specified in config. Choosing only existing disk: $DISKS for partitioning." 1>&2
+      pwarning "Automatic partitioning enabled, but SLX_CHOOSEN_DISK not specified in config. Choosing only existing disk: $DISKS for partitioning."
     else
-      echo "ERROR: Automatic partitioning enabled, but SLX_CHOOSEN_DISK not specified in config. More than one disk exists, please specify disk in config and run again." 1>&2
-      return 1
+      perror "Automatic partitioning enabled, but SLX_CHOOSEN_DISK not specified in config. More than one disk exists, please specify disk in config and run again."
     fi
   else
     local dialog_string="Existing disks with partition tables:\n\n"
@@ -111,12 +124,11 @@ choose_disk() {
     if [ $(echo $DISKS | tr ' ' \\n           | wc -l) -gt 0 ]; then
       SLX_CHOOSEN_DISK=$(echo $options | xargs dialog --title "Choose a disk to partition:" --no-tags --cr-wrap --no-collapse --stdout --menu "${dialog_string}" 0 0 0)
       if [ -z $SLX_CHOOSEN_DISK ]; then
-        echo "INFO: Partitioning aborted by user." 1>&2
-        return 1
+        pwarning "Partitioning aborted by user."
+        exit 1
       fi
     else
-      dialog --title "ERROR" --stdout --msgbox "Can't find a hard disk." 10 40
-      return 2
+      perror "Can't find a hard disk."
     fi
   fi
   CHOOSEN_DISK_SIZE=$(echo "$(cat $PARTITIONSPATH | grep -e $SLX_CHOOSEN_DISK$ | tr -s ' ' | cut -d ' ' -f4)*$BLOCKSIZE" | bc)
@@ -130,11 +142,7 @@ check_disk_size() {
   NEEDED_DISK_SPACE=$(echo "$part_space*1024*1024*1024+$part_number*1024*1024" | bc)
 
   if [ $(echo "$CHOOSEN_DISK_SIZE<$NEEDED_DISK_SPACE" | bc) -eq 1 ]; then
-    echo "ERROR: Insufficient space on disk /dev/$SLX_CHOOSEN_DISK\n  DISK SIZE: $(size_conv $CHOOSEN_DISK_SIZE)\n  REQUIRED SIZE: $(size_conv $NEEDED_DISK_SPACE)" 1>&2
-    if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
-      dialog --title "ERROR" --stdout --msgbox "Insufficient space on disk /dev/$SLX_CHOOSEN_DISK\n  DISK SIZE: $(size_conv $CHOOSEN_DISK_SIZE)\n  REQUIRED SIZE: $(size_conv $NEEDED_DISK_SPACE) " 6 40
-    fi
-    return 1
+    perror "Insufficient space on disk /dev/$SLX_CHOOSEN_DISK\n  DISK SIZE: $(size_conv $CHOOSEN_DISK_SIZE)\n  REQUIRED SIZE: $(size_conv $NEEDED_DISK_SPACE)"
   fi
 }
 
@@ -142,13 +150,13 @@ select_partition_type() {
   # choosing the partition type (MSDOS or GPT) if it wasn't set in config file
   if [ -z "$SLX_PARTITION_TYPE" ]; then
     if [ "$SLX_AUTOMATIC_PARTITIONING" = "yes" ]; then
-      echo "INFO: SLX_PARTITION_TYPE not defined in config, using default: msdos" 1>&2
+      pwarning "SLX_PARTITION_TYPE not defined in config, using default: msdos"
       SLX_PARTITION_TYPE=msdos
     else
       SLX_PARTITION_TYPE=$(dialog --no-tags --title "Choose a partition type:" --menu --stdout "Partitions types:" 0 0 0 "msdos" " MSDOS " "GPT" " GPT ")
       if [ -z $SLX_PARTITION_TYPE ]; then
-        echo "INFO: Partitioning aborted by user." 1>&2
-        return 1
+        pwarning "Partitioning aborted by user."
+        exit 1
       fi
     fi
   fi
@@ -211,21 +219,19 @@ confirm_partitioning() {
   # asking confirmation to create the partitions
   dialog --title "WARNING" --stdout --defaultno --yesno "$dialog_string" 0 0
   if [ $? -eq 1 ]; then
-    echo "INFO: Partitioning aborted by user." 1>&2
-    return 1
+    pwarning "Partitioning aborted by user."
+    exit 1
   fi
 }
 
 # function to create gpt type partition tables (uses sgdisk)
 partition_disk_gpt() {
   # delete partition table
-  sgdisk -Z /dev/$SLX_CHOOSEN_DISK > /dev/null 2>&1 # erase all partitions
+  sgdisk -Z /dev/$SLX_CHOOSEN_DISK > /dev/null 2>&1 || perror "Error erasing old partition table"
 
   #set dialog
-  if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
-    dialog_string="New partitions created:\n\n"
-    echo "0" | dialog --stdout --gauge "$dialog_string" 0 0 0
-  fi
+  dialog_string="Partitions created:\n\n"
+  echo "0" | dialog --title "Partitioner" --stdout --gauge "$dialog_string" 0 0 0
 
   # loop that will create each GPT partition, change GUIDS, change names, and set bootable flags.
   local counter=1
@@ -250,51 +256,49 @@ partition_disk_gpt() {
     esac
 
     #set size of partition
-    sgdisk /dev/${SLX_CHOOSEN_DISK} -n ${counter}:0:+${size}G 1>&2
+    sgdisk /dev/${SLX_CHOOSEN_DISK} -n ${counter}:0:+${size}G 1>&2 || perror "Error setting size of GPT partition ${SLX_CHOOSEN_DISK}${counter}"
 
     #set id of partition
     if [ "${id}" = "82" ] || [ "${id}" = "83" ]; then
-      sgdisk /dev/${SLX_CHOOSEN_DISK} -t ${counter}:${id}00 1>&2
+      sgdisk /dev/${SLX_CHOOSEN_DISK} -t ${counter}:${id}00 1>&2 || perror "Error setting id ${id} of GPT partition ${SLX_CHOOSEN_DISK}${counter}"
     else
-      sgdisk /dev/${SLX_CHOOSEN_DISK} -t ${counter}:${id}000000-0000-0000-0000-000000000000 -c ${counter}:\"${mountpoint}\" 1>&2
+      sgdisk /dev/${SLX_CHOOSEN_DISK} -t ${counter}:${id}000000-0000-0000-0000-000000000000 -c ${counter}:\"${mountpoint}\" 1>&2 || perror "Error setting id ${id} of GPT partition ${SLX_CHOOSEN_DISK}${counter}"
     fi
 
     #set boot flag
     if [ "$bootable" -eq 1 ]; then
-      sgdisk /dev/${SLX_CHOOSEN_DISK} -A ${counter}:set:2 1>&2
+      sgdisk /dev/${SLX_CHOOSEN_DISK} -A ${counter}:set:2 1>&2 || perror "Error setting boot flag for GPT partition ${SLX_CHOOSEN_DISK}${counter}"
     fi
 
-    if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
-      #update dialog status
-      [ "$id" = "82" ] && mountpoint="swap"
-      dialog_string="${dialog_string}${mountpoint} (/dev/"${SLX_CHOOSEN_DISK}${counter}")\n"
-      if [ "${id}" = "82" ]; then
-        dialog_string="${dialog_string}   GUID: 0657FD6D-A4AB-43C4-84E5-0933C84B4F4F\n"
-      elif [ "${id}" = "83" ]; then
-        dialog_string="${dialog_string}   GUID: 0FC63DAF-8483-4772-8E79-3D69D8477DE4\n"
-      else
-        dialog_string="${dialog_string}   GUID: "$id"000000-0000-0000-0000-000000000000\n"
-      fi
-      dialog_string="${dialog_string}   Size: "$size" GB\n"
-      echo $(echo "(100/$part_number)*$counter" | bc) | dialog --stdout --gauge "${dialog_string}" 0 0 0
+    #update dialog status
+    [ "$id" = "82" ] && mountpoint="swap"
+    dialog_string="${dialog_string}${mountpoint} (/dev/"${SLX_CHOOSEN_DISK}${counter}")\n"
+    if [ "${id}" = "82" ]; then
+      dialog_string="${dialog_string}   GUID: 0657FD6D-A4AB-43C4-84E5-0933C84B4F4F\n"
+    elif [ "${id}" = "83" ]; then
+      dialog_string="${dialog_string}   GUID: 0FC63DAF-8483-4772-8E79-3D69D8477DE4\n"
+    else
+      dialog_string="${dialog_string}   GUID: "$id"000000-0000-0000-0000-000000000000\n"
     fi
+    dialog_string="${dialog_string}   Size: "$size" GB\n"
+    echo $(echo "(100/$part_number)*$counter" | bc) | dialog --title "Partitioner" --stdout --gauge "${dialog_string}" 0 0 0
 
     counter=$(($counter+1))
   done
   unset IFS
 
   if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
-    dialog --title "Creating partitions..." --stdout --msgbox "$dialog_string" 0 0
+    dialog --title "Partitioner" --stdout --msgbox "$dialog_string" 0 0
   fi
 }
 
 #function to create msdos type partition tables (uses sfdisk)
 partition_disk_msdos(){
   # delete partition table
-  sgdisk -Z /dev/$SLX_CHOOSEN_DISK > /dev/null 2>&1 # erase all partitions
+  sgdisk -Z /dev/$SLX_CHOOSEN_DISK > /dev/null 2>&1 || perror "Error erasing old partition table"
 
   #set dialog
-  dialog_string="New partitions created:\n\n"
+  dialog_string="Partitions created:\n\n"
 
   # constructing the sfdisk input file
   echo "unit: sectors"> /tmp/partitiontable.tmp
@@ -350,27 +354,30 @@ partition_disk_msdos(){
   done
   unset IFS
 
-  sfdisk -q --no-reread -f /dev/${SLX_CHOOSEN_DISK} < /tmp/partitiontable.tmp 1>&2
+  sfdisk -q --no-reread -f /dev/${SLX_CHOOSEN_DISK} < /tmp/partitiontable.tmp 1>&2 || return 0
   # rm -f /tmp/partitiontable.tmp
 
   if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
-    dialog --title "Creating partitions..." --stdout --msgbox "$dialog_string" 0 0
+    dialog --title "Partitioner" --stdout --msgbox "$dialog_string" 0 0
+  else
+    dialog --title "Partitioner" --stdout --infobox "$dialog_string" 0 0
+    sleep 5
   fi
 }
 
 
-define_partition_table || exit 1;
-choose_disk || exit 1;
-select_partition_type || exit 1;
+define_partition_table
+choose_disk
+select_partition_type
 if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
-  confirm_partitioning || exit 1;
+  confirm_partitioning
 fi
-check_disk_size || exit 1;
+check_disk_size
 
 if [ $SLX_PARTITION_TYPE = 'GPT' ]; then
-  partition_disk_gpt || { echo "Error while writing GPT partition table to disk" 1>&2; exit 1; }
+  partition_disk_gpt
 else
-  partition_disk_msdos || { echo "Error while writing msdos partition table to disk" 1>&2; exit 1; }
+  partition_disk_msdos
 fi
 
 if [ "$SLX_AUTOMATIC_PARTITIONING" != "yes" ]; then
-- 
cgit v1.2.3-55-g7522


From 27b17f17f2051f8336aa77022135e95404700c54 Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Thu, 16 Oct 2014 16:32:20 -0300
Subject: [partitioner] Create special boot partition for the bootloader when
 using GPT

---
 .../opt/openslx/scripts/systemd-partitioner        | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'server/modules')

diff --git a/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner b/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner
index f8b7b819..cbc71030 100755
--- a/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner
+++ b/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner
@@ -255,6 +255,17 @@ partition_disk_gpt() {
                *) bootable=0 ;;
     esac
 
+    #create boot partition and set boot flag
+    if [ "$bootable" -eq 1 ]; then
+      sgdisk /dev/${SLX_CHOOSEN_DISK} -n ${counter}:0:+1M 1>&2 || perror "Error setting size of GPT partition ${SLX_CHOOSEN_DISK}${counter}" 
+      sgdisk /dev/${SLX_CHOOSEN_DISK} -t ${counter}:21686148-6449-6E6F-744E-656564454649 1>&2 || perror "Error setting id ${id} of GPT partition ${SLX_CHOOSEN_DISK}${counter}"
+      sgdisk /dev/${SLX_CHOOSEN_DISK} -A ${counter}:set:2 1>&2 || perror "Error setting boot flag for GPT partition ${SLX_CHOOSEN_DISK}${counter}"
+      dialog_string="${dialog_string}Special bootloader partition (/dev/${SLX_CHOOSEN_DISK}${counter})\n"
+      dialog_string="${dialog_string}   GUID: 21686148-6449-6E6F-744E-656564454649\n"
+      dialog_string="${dialog_string}   Size: 1 MB\n"
+      counter=$(($counter+1))
+    fi
+
     #set size of partition
     sgdisk /dev/${SLX_CHOOSEN_DISK} -n ${counter}:0:+${size}G 1>&2 || perror "Error setting size of GPT partition ${SLX_CHOOSEN_DISK}${counter}"
 
@@ -265,22 +276,17 @@ partition_disk_gpt() {
       sgdisk /dev/${SLX_CHOOSEN_DISK} -t ${counter}:${id}000000-0000-0000-0000-000000000000 -c ${counter}:\"${mountpoint}\" 1>&2 || perror "Error setting id ${id} of GPT partition ${SLX_CHOOSEN_DISK}${counter}"
     fi
 
-    #set boot flag
-    if [ "$bootable" -eq 1 ]; then
-      sgdisk /dev/${SLX_CHOOSEN_DISK} -A ${counter}:set:2 1>&2 || perror "Error setting boot flag for GPT partition ${SLX_CHOOSEN_DISK}${counter}"
-    fi
-
     #update dialog status
     [ "$id" = "82" ] && mountpoint="swap"
-    dialog_string="${dialog_string}${mountpoint} (/dev/"${SLX_CHOOSEN_DISK}${counter}")\n"
+    dialog_string="${dialog_string}${mountpoint} (/dev/${SLX_CHOOSEN_DISK}${counter})\n"
     if [ "${id}" = "82" ]; then
       dialog_string="${dialog_string}   GUID: 0657FD6D-A4AB-43C4-84E5-0933C84B4F4F\n"
     elif [ "${id}" = "83" ]; then
       dialog_string="${dialog_string}   GUID: 0FC63DAF-8483-4772-8E79-3D69D8477DE4\n"
     else
-      dialog_string="${dialog_string}   GUID: "$id"000000-0000-0000-0000-000000000000\n"
+      dialog_string="${dialog_string}   GUID: ${id}000000-0000-0000-0000-000000000000\n"
     fi
-    dialog_string="${dialog_string}   Size: "$size" GB\n"
+    dialog_string="${dialog_string}   Size: ${size} GB\n"
     echo $(echo "(100/$part_number)*$counter" | bc) | dialog --title "Partitioner" --stdout --gauge "${dialog_string}" 0 0 0
 
     counter=$(($counter+1))
-- 
cgit v1.2.3-55-g7522


From 598199aa1b3f1695b70a6dec552a7458bc514437 Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Fri, 17 Oct 2014 12:12:01 -0300
Subject: [partitioner] fix status bar for gpt partitioning

---
 server/modules/partitioner/opt/openslx/scripts/systemd-partitioner | 1 +
 1 file changed, 1 insertion(+)

(limited to 'server/modules')

diff --git a/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner b/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner
index cbc71030..d8fa0c6d 100755
--- a/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner
+++ b/server/modules/partitioner/opt/openslx/scripts/systemd-partitioner
@@ -264,6 +264,7 @@ partition_disk_gpt() {
       dialog_string="${dialog_string}   GUID: 21686148-6449-6E6F-744E-656564454649\n"
       dialog_string="${dialog_string}   Size: 1 MB\n"
       counter=$(($counter+1))
+      part_number=$(($part_number+1))
     fi
 
     #set size of partition
-- 
cgit v1.2.3-55-g7522


From 5bf434d63342ffbbb052c02e647f4cdd3a0daa8b Mon Sep 17 00:00:00 2001
From: Tiago
Date: Fri, 11 Jul 2014 15:04:12 -0300
Subject: [dnbd3-cache]include dnbd-server add service file

---
 .../modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service |  3 ++-
 remote/modules/dnbd3/module.build                             |  5 ++++-
 remote/modules/dnbd3/module.conf                              |  1 +
 .../data/etc/systemd/system/mount-stage4.service              |  4 ++--
 server/configs/curitiba/dnbd3-cache                           |  1 +
 server/configs/curitiba/ubuntu-14.04-unity-panel-service-fix  |  1 -
 .../dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service  | 11 +++++++++++
 .../system/sysinit.target.wants/setup-dnbd3_cache.service     |  1 +
 .../modules/dnbd3-cache/opt/openslx/dnbd3-cache/alt-servers   |  1 +
 .../modules/dnbd3-cache/opt/openslx/dnbd3-cache/server.conf   |  9 +++++++++
 .../dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache |  8 ++++++++
 11 files changed, 40 insertions(+), 5 deletions(-)
 create mode 120000 server/configs/curitiba/dnbd3-cache
 delete mode 120000 server/configs/curitiba/ubuntu-14.04-unity-panel-service-fix
 create mode 100644 server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
 create mode 120000 server/modules/dnbd3-cache/etc/systemd/system/sysinit.target.wants/setup-dnbd3_cache.service
 create mode 100644 server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/alt-servers
 create mode 100644 server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/server.conf
 create mode 100755 server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache

(limited to 'server/modules')

diff --git a/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service b/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
index 516cbfa2..7d34480d 100644
--- a/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
+++ b/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Setup dnbd3 kernel module and user space daemon
-After=sysinit.target
 Before=shutdown.target
 DefaultDependencies=no
 
@@ -9,3 +8,5 @@ ExecStart=/opt/openslx/scripts/systemd-setup_dnbd3
 ExecStop=/opt/openslx/bin/dnbd3-client --kill
 ExecStopPost=/opt/openslx/bin/rm /var/run/dnbd3.socket
 Restart=on-abort
+
+
diff --git a/remote/modules/dnbd3/module.build b/remote/modules/dnbd3/module.build
index cdbd8251..fd56b4f7 100644
--- a/remote/modules/dnbd3/module.build
+++ b/remote/modules/dnbd3/module.build
@@ -27,13 +27,16 @@ build() {
 	cd "$MODULE_DIR/src/kmod" || perror "Could not CD to standalone dnbd3 kmod dir"
 	make MODULE_NAME=dnbd3 KDIR="$KERNEL_HEADERS_DIR" || perror "Could not compile kernel module"
 	mkdir -p "$MODULE_BUILD_DIR/lib/modules/dnbd3" || perror "Could not create lib/modules/dnbd3"
-	mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" || perror "Coould not create opt/openslx/bin"
+	mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" || perror "Could not create opt/openslx/bin"
 	cp "$MODULE_DIR/src/kmod/dnbd3.ko" "$MODULE_BUILD_DIR/lib/modules/dnbd3/" || perror "could not cp dnbd3.ko"
 	cd "$MODULE_BUILD_DIR/opt/openslx/bin" || perror "Could not cd to build dir for client binary"
 	cmake "$MODULE_DIR/src/dnbd3" || perror "Could not cmake"
 	make dnbd3-client || perror "Could not make dnbd3-client"
 	chown root:root "dnbd3-client"
 	chmod +xs "dnbd3-client"
+	make dnbd3-server || perror "Could not make dnbd3-server"
+	chown root:root "dnbd3-server"
+	chmod +xs "dnbd3-server"	
 	cd "$MODULE_DIR"
 }
 
diff --git a/remote/modules/dnbd3/module.conf b/remote/modules/dnbd3/module.conf
index 631b0e23..f917b1b4 100644
--- a/remote/modules/dnbd3/module.conf
+++ b/remote/modules/dnbd3/module.conf
@@ -5,6 +5,7 @@ REQUIRED_GIT="git://git.openslx.org/dnbd3.git"
 REQUIRED_COMMIT="bc4ee543ce5beec823ae0cbd811bb7febe43103f"
 REQUIRED_BINARIES="
 	dnbd3-client
+	dnbd3-server
 "
 REQUIRED_DIRECTORIES="
 	/lib/modules
diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service
index 7f8b54a8..0b453165 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service
+++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/mount-stage4.service
@@ -1,8 +1,8 @@
 [Unit]
 Description=Mount Openslx Stage 4
 DefaultDependencies=no
-Wants=setup-dnbd3.service stage4.target
-After=setup-dnbd3.service
+Wants=setup-dnbd3.service setup-dnbd3_cache.service stage4.target
+After=setup-dnbd3.service setup-dnbd3_cache.service
 Before=stage4.target
 
 [Service]
diff --git a/server/configs/curitiba/dnbd3-cache b/server/configs/curitiba/dnbd3-cache
new file mode 120000
index 00000000..9bc8ef6f
--- /dev/null
+++ b/server/configs/curitiba/dnbd3-cache
@@ -0,0 +1 @@
+../../modules/dnbd3-cache/
\ No newline at end of file
diff --git a/server/configs/curitiba/ubuntu-14.04-unity-panel-service-fix b/server/configs/curitiba/ubuntu-14.04-unity-panel-service-fix
deleted file mode 120000
index c7444165..00000000
--- a/server/configs/curitiba/ubuntu-14.04-unity-panel-service-fix
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/ubuntu-14.04-unity-panel-service-fix
\ No newline at end of file
diff --git a/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service b/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
new file mode 100644
index 00000000..45d259a2
--- /dev/null
+++ b/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Setup dnbd3-server as proxy/cache daemon
+Requires=setup-dnbd3.service
+After=sysinit.target setup-dnbd3.service
+Before=shutdown.target
+DefaultDependencies=no
+
+[Service]
+ExecStart=/opt/openslx/scripts/systemd-setup_dnbd3_cache
+ExecStop=/opt/openslx/usr/bin/killall dnbd3-server
+Restart=on-abort
diff --git a/server/modules/dnbd3-cache/etc/systemd/system/sysinit.target.wants/setup-dnbd3_cache.service b/server/modules/dnbd3-cache/etc/systemd/system/sysinit.target.wants/setup-dnbd3_cache.service
new file mode 120000
index 00000000..9ed23a9f
--- /dev/null
+++ b/server/modules/dnbd3-cache/etc/systemd/system/sysinit.target.wants/setup-dnbd3_cache.service
@@ -0,0 +1 @@
+../setup-dnbd3_cache.service
\ No newline at end of file
diff --git a/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/alt-servers b/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/alt-servers
new file mode 100644
index 00000000..3d9801ca
--- /dev/null
+++ b/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/alt-servers
@@ -0,0 +1 @@
+-200.17.202.46 SLXBOX DNBD3 SERVER
diff --git a/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/server.conf b/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/server.conf
new file mode 100644
index 00000000..53f5902d
--- /dev/null
+++ b/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/server.conf
@@ -0,0 +1,9 @@
+[dnbd3]
+#vmdkLegacyMode=TRUE
+#clientPenalty=300000
+clientPenalty=0
+basePath=/tmp/export/dnbd3
+isProxy=true
+proxyPrivateOnly=true
+uplinkTimeout=5000
+
diff --git a/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache b/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
new file mode 100755
index 00000000..472a4622
--- /dev/null
+++ b/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
@@ -0,0 +1,8 @@
+#!/bin/ash
+
+[ -d "/tmp/export/dnbd3" ] ||  mkdir -p /tmp/export/dnbd3/
+
+exec dnbd3-server -c /opt/openslx/dnbd3-cache -n
+slxlog "dnbd3-server" "Error launching dnbd3-server"
+exit 1
+
-- 
cgit v1.2.3-55-g7522


From 3ca99e519e3aec5027474a9fe89c646036bafb8c Mon Sep 17 00:00:00 2001
From: Tiago
Date: Wed, 6 Aug 2014 10:40:49 -0300
Subject: [dnbd3-cache] partition script changed

---
 .../opt/openslx/scripts/systemd-setup_partitions   | 49 +++++++++++++++++-----
 .../opt/openslx/dnbd3-cache/server.conf            |  2 +-
 .../opt/openslx/scripts/systemd-setup_dnbd3_cache  |  2 +-
 3 files changed, 40 insertions(+), 13 deletions(-)

(limited to 'server/modules')

diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
index f9640589..26d1c753 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions
@@ -14,8 +14,10 @@
 
 #############################################################################
 
-# Mount point for persistent scratch partition (type 45)
-PERSISTENT="/opt/openslx/persistent"
+# Mount point for persistent scratch partition (type 43 for BOOT, type42 for CACHE, type 41 for HOME)
+PERSISTENT_BOOT="/boot"	 
+PERSISTENT_CACHE="/cache"
+PERSISTENT_HOME="/home"
 
 # General formatter for the /tmp partition on a local harddisk
 diskfm () {
@@ -120,20 +122,43 @@ done
 
 # Put detected linux partitions (83) into /etc/fstab with "noauto", special
 # partition 45 (persistent scratch) to /var/scratch and 46 to /var/openslx
-HAVE_PERSISTENT=no
-for partid in 83 45 46 ; do
+HAVE_PERSISTENT_BOOT=no
+HAVE_PERSISTENT_CACHE=no
+HAVE_PERSISTENT_HOME=no
+for partid in 83 49 48 47 46 44 ; do
 	for hdpartnr in $(sed -n -e "/ ${partid} /p" "/etc/disk.partition" | sed -e "s/[[:space:]].*//"); do
 		if [ "${partid}" -eq 83 ]; then
 			mkdir -p "/media/${hdpartnr#/dev/*}"
 			echo -e "${hdpartnr}\t/media/${hdpartnr#/dev/*}\tauto\t\tnoauto,noexec\t 0 0" >> "/etc/fstab"
-		elif [ "${partid}" -eq 45 -a "$HAVE_PERSISTENT" = "no" ]; then
-			mkdir -p "$PERSISTENT"
-			if ! mount -t auto -o noexec "${hdpartnr}" "$PERSISTENT"; then
+		
+		elif [ "${partid}" -eq 49 -a "$HAVE_PERSISTENT_BOOT" = "no" ]; then
+			mkdir -p "$PERSISTENT_BOOT"
+			if ! mount -t auto -o noexec "${hdpartnr}" "$PERSISTENT_BOOT"; then
 				diskfm "$hdpartnr" "jfs xfs ext3" || continue
-				mount -t auto -o noexec "${hdpartnr}" "$PERSISTENT" || continue
+				mount -t auto -o noexec "${hdpartnr}" "$PERSISTENT_BOOT" || continue
 			fi
-			HAVE_PERSISTENT=yes
-			echo -e "${hdpartnr}\t${PERSISTENT}\tauto\t\tnoauto,noexec\t\t 0 0" >> "/etc/fstab"
+			HAVE_PERSISTENT_BOOT=yes
+			echo -e "${hdpartnr}\t${PERSISTENT_BOOT}\tauto\t\tnoauto,noexec\t\t 0 0" >> "/etc/fstab"
+		
+		elif [ "${partid}" -eq 48 -a "$HAVE_PERSISTENT_CACHE" = "no" ]; then
+			mkdir -p "$PERSISTENT_CACHE"
+			if ! mount -t auto -o noexec "${hdpartnr}" "$PERSISTENT_CACHE"; then
+				diskfm "$hdpartnr" "jfs xfs ext3" || continue
+				mount -t auto -o noexec "${hdpartnr}" "$PERSISTENT_CACHE" || continue
+			fi
+			HAVE_PERSISTENT_CACHE=yes
+			echo -e "${hdpartnr}\t${PERSISTENT_CACHE}\tauto\t\tnoauto,noexec\t\t 0 0" >> "/etc/fstab"
+
+		elif [ "${partid}" -eq 47 -a "$HAVE_PERSISTENT_HOME" = "no" ]; then
+			mkdir -p "$PERSISTENT_HOME"
+			if ! mount -t auto -o noexec "${hdpartnr}" "$PERSISTENT_HOME"; then
+				diskfm "$hdpartnr" "jfs xfs ext3" || continue
+				mount -t auto -o noexec "${hdpartnr}" "$PERSISTENT_HOME" || continue
+			fi
+			HAVE_PERSISTENT_HOME=yes
+			echo -e "${hdpartnr}\t${PERSISTENT_HOME}\tauto\t\tnoauto,noexec\t\t 0 0" >> "/etc/fstab"
+
+	
 		elif [ "${partid}" -eq 46 ]; then
 			mkdir -p "/media/${hdpartnr#/dev/*}"
 			#mount -t auto ${hdpartnr} /mnt/media/${hdpartnr#/dev/*} \n\
@@ -143,7 +168,9 @@ for partid in 83 45 46 ; do
 		fi
 	done
 done
-[ "$HAVE_PERSISTENT" = "no" -a -d "$PERSISTENT" ] && rm -f "$PERSISTENT"
+[ "$HAVE_PERSISTENT_BOOT" = "no" -a -d "$PERSISTENT_BOOT" ] && rm -f "$PERSISTENT_BOOT"
+[ "$HAVE_PERSISTENT_CACHE" = "no" -a -d "$PERSISTENT_CACHE" ] && rm -f "$PERSISTENT_CACHE"
+[ "$HAVE_PERSISTENT_HOME" = "no" -a -d "$PERSISTENT_HOME" ] && rm -f "$PERSISTENT_HOME"
 
 mount -a
 
diff --git a/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/server.conf b/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/server.conf
index 53f5902d..c0820ea1 100644
--- a/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/server.conf
+++ b/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/server.conf
@@ -2,7 +2,7 @@
 #vmdkLegacyMode=TRUE
 #clientPenalty=300000
 clientPenalty=0
-basePath=/tmp/export/dnbd3
+basePath=/cache/export/dnbd3
 isProxy=true
 proxyPrivateOnly=true
 uplinkTimeout=5000
diff --git a/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache b/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
index 472a4622..705c5c89 100755
--- a/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
+++ b/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
@@ -1,6 +1,6 @@
 #!/bin/ash
 
-[ -d "/tmp/export/dnbd3" ] ||  mkdir -p /tmp/export/dnbd3/
+[ -d "/cache/export/dnbd3" ] ||  mkdir -p /cache/export/dnbd3/
 
 exec dnbd3-server -c /opt/openslx/dnbd3-cache -n
 slxlog "dnbd3-server" "Error launching dnbd3-server"
-- 
cgit v1.2.3-55-g7522


From 236cd1e67f49a90eb2be99fd8d7c53d7fe977c10 Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Fri, 17 Oct 2014 11:31:23 -0300
Subject: [dnbd3_cache] fix path for killall binary

---
 server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server/modules')

diff --git a/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service b/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
index 45d259a2..518fb152 100644
--- a/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
+++ b/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
@@ -7,5 +7,5 @@ DefaultDependencies=no
 
 [Service]
 ExecStart=/opt/openslx/scripts/systemd-setup_dnbd3_cache
-ExecStop=/opt/openslx/usr/bin/killall dnbd3-server
+ExecStop=/opt/openslx/bin/killall dnbd3-server
 Restart=on-abort
-- 
cgit v1.2.3-55-g7522


From 8168a005130c82167370ff2a784aca5416e9668f Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Fri, 24 Oct 2014 11:15:15 -0200
Subject: [client-cache] fix server not starting due to race condition

---
 .../rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4       | 3 ---
 .../modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache  | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'server/modules')

diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4 b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
index c62994a0..277efa05 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-mount_stage4
@@ -8,9 +8,6 @@
 MOUNTPOINT="/opt/openslx/mnt/stage4"
 mkdir -p "$MOUNTPOINT"
 
-killall -USR1 dnbd3-server
-sleep 3
-
 if [[ "$SLX_STAGE4" == dnbd3* ]]; then
 	# dnbd3 it is
 	if [ -z "${SLX_DNBD3_SERVERS}${SLX_DNBD3_PRIO_SERVERS}" ]; then
diff --git a/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache b/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
index 705c5c89..faae9879 100755
--- a/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
+++ b/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
@@ -2,6 +2,8 @@
 
 [ -d "/cache/export/dnbd3" ] ||  mkdir -p /cache/export/dnbd3/
 
+[ -e /var/run/dnbd3.socket ] || sleep 2 # Ugly, service should only start when dnbd3 daemon is up and running
+
 exec dnbd3-server -c /opt/openslx/dnbd3-cache -n
 slxlog "dnbd3-server" "Error launching dnbd3-server"
 exit 1
-- 
cgit v1.2.3-55-g7522


From 9fae164ab6be88905f1614e5093a3e899a1fc891 Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Fri, 24 Oct 2014 14:19:29 -0200
Subject: [client-cache] second try to solve race condition...

---
 .../modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service  | 4 ++--
 .../modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'server/modules')

diff --git a/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service b/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
index 518fb152..9ca6353d 100644
--- a/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
+++ b/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Setup dnbd3-server as proxy/cache daemon
-Requires=setup-dnbd3.service
-After=sysinit.target setup-dnbd3.service
+Requires=setup-dnbd3.service setup-partitions.service
+After=sysinit.target setup-dnbd3.service setup-partitions.service
 Before=shutdown.target
 DefaultDependencies=no
 
diff --git a/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache b/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
index faae9879..705c5c89 100755
--- a/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
+++ b/server/modules/dnbd3-cache/opt/openslx/scripts/systemd-setup_dnbd3_cache
@@ -2,8 +2,6 @@
 
 [ -d "/cache/export/dnbd3" ] ||  mkdir -p /cache/export/dnbd3/
 
-[ -e /var/run/dnbd3.socket ] || sleep 2 # Ugly, service should only start when dnbd3 daemon is up and running
-
 exec dnbd3-server -c /opt/openslx/dnbd3-cache -n
 slxlog "dnbd3-server" "Error launching dnbd3-server"
 exit 1
-- 
cgit v1.2.3-55-g7522


From 83ca05c4bbed51cf39d34c01d27fd5a996d262ff Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Fri, 24 Oct 2014 14:42:26 -0200
Subject: [client-cache] Make waiting for setup-partitions optional

---
 .../modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'server/modules')

diff --git a/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service b/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
index 9ca6353d..2eaeddc4 100644
--- a/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
+++ b/server/modules/dnbd3-cache/etc/systemd/system/setup-dnbd3_cache.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Setup dnbd3-server as proxy/cache daemon
-Requires=setup-dnbd3.service setup-partitions.service
+Requires=setup-dnbd3.service
+Wants=setup-partitions.service
 After=sysinit.target setup-dnbd3.service setup-partitions.service
 Before=shutdown.target
 DefaultDependencies=no
-- 
cgit v1.2.3-55-g7522


From 2f11f01424c8766a5d1ab6aecdaf3943ca9257c0 Mon Sep 17 00:00:00 2001
From: Lucas Affonso Xavier de Morais
Date: Mon, 10 Nov 2014 10:41:57 -0200
Subject: Issue #1870: [local_accounts] local_accounts config module created.

---
 .../opt/openslx/scripts/systemd-shutdown_prescript |  13 +
 remote/rootfs/rootfs-stage32/module.conf           |  10 +
 server/configs/curitiba/local_accounts             |   1 +
 .../etc/cron.d/openslx-local_accounts              |   6 +
 server/modules/local_accounts/etc/login.defs       | 335 +++++++++++++++++++++
 .../etc/systemd/system/local_accounts.service      |   9 +
 .../multi-user.target.wants/local_accounts.service |   1 +
 .../opt/openslx/scripts/local_accounts-cron_script |   9 +
 .../opt/openslx/scripts/systemd-create_users       |  57 ++++
 9 files changed, 441 insertions(+)
 create mode 120000 server/configs/curitiba/local_accounts
 create mode 100644 server/modules/local_accounts/etc/cron.d/openslx-local_accounts
 create mode 100644 server/modules/local_accounts/etc/login.defs
 create mode 100644 server/modules/local_accounts/etc/systemd/system/local_accounts.service
 create mode 120000 server/modules/local_accounts/etc/systemd/system/multi-user.target.wants/local_accounts.service
 create mode 100755 server/modules/local_accounts/opt/openslx/scripts/local_accounts-cron_script
 create mode 100755 server/modules/local_accounts/opt/openslx/scripts/systemd-create_users

(limited to 'server/modules')

diff --git a/remote/modules/systemd/data/opt/openslx/scripts/systemd-shutdown_prescript b/remote/modules/systemd/data/opt/openslx/scripts/systemd-shutdown_prescript
index 3b5d7f92..e3a45ecf 100755
--- a/remote/modules/systemd/data/opt/openslx/scripts/systemd-shutdown_prescript
+++ b/remote/modules/systemd/data/opt/openslx/scripts/systemd-shutdown_prescript
@@ -38,6 +38,14 @@ umount_samba_shares() {
 	done
 }
 
+backup_users(){
+	# create patch files to backup the users created by the openslx, so we can restore then in the next session.
+	for file in passwd shadow group; do
+		diff -u /home/openslx/.$file.backup /etc/$file > /home/openslx/.$file.patch
+	done
+	echo "Patch of /etc/{passwd,shadow,group} generated at /home/openslx/.{passwd,shadow,group}.patch"
+}
+
 # Searching for nfs-shares in mtab:
 if [ $(echo /etc/mtab | cut -d " " -f 3 | grep -q nfs) ]; then
 	umount_nfs_shares
@@ -47,4 +55,9 @@ fi
 if [ $(echo /etc/mtab|cut -d " " -f 3 | grep -q cifs) ]; then
 	umount_samba_shares
 fi
+
+if [ -d /home/openslx ]; then
+	backup_users
+fi
+
 exit $ERRORLEVEL
diff --git a/remote/rootfs/rootfs-stage32/module.conf b/remote/rootfs/rootfs-stage32/module.conf
index 3a160a36..eb17dfe8 100644
--- a/remote/rootfs/rootfs-stage32/module.conf
+++ b/remote/rootfs/rootfs-stage32/module.conf
@@ -18,6 +18,11 @@ REQUIRED_BINARIES="
 	mkfs.xfs
 	mkfs.ext3
 	mkfs.ext4
+	fsck.ext3
+	fsck.ext4
+	fsck.jfs
+	fsck.xfs
+	fsck
 	blkid
 	modprobe
 	ps
@@ -38,6 +43,11 @@ REQUIRED_BINARIES="
 	getent
 	ldconfig
 	grep
+	sfdisk
+	sgdisk
+	dialog
+	useradd
+	patch
 "
 REQUIRED_LIBRARIES="
 	libcap
diff --git a/server/configs/curitiba/local_accounts b/server/configs/curitiba/local_accounts
new file mode 120000
index 00000000..c28e06ff
--- /dev/null
+++ b/server/configs/curitiba/local_accounts
@@ -0,0 +1 @@
+../../modules/local_accounts
\ No newline at end of file
diff --git a/server/modules/local_accounts/etc/cron.d/openslx-local_accounts b/server/modules/local_accounts/etc/cron.d/openslx-local_accounts
new file mode 100644
index 00000000..948ee329
--- /dev/null
+++ b/server/modules/local_accounts/etc/cron.d/openslx-local_accounts
@@ -0,0 +1,6 @@
+# Trigger scripts that checks idle status of machine and triggers actions
+
+SHELL=/bin/ash
+PATH=/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin
+ 
+*/5 *    * * *   root   /opt/openslx/scripts/local_accounts-cron_script
diff --git a/server/modules/local_accounts/etc/login.defs b/server/modules/local_accounts/etc/login.defs
new file mode 100644
index 00000000..9bca35e0
--- /dev/null
+++ b/server/modules/local_accounts/etc/login.defs
@@ -0,0 +1,335 @@
+#
+# /etc/login.defs - Configuration control definitions for the login package.
+#
+# Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
+# If unspecified, some arbitrary (and possibly incorrect) value will
+# be assumed.  All other items are optional - if not specified then
+# the described action or option will be inhibited.
+#
+# Comment lines (lines beginning with "#") and blank lines are ignored.
+#
+# Modified for Linux.  --marekm
+
+# REQUIRED for useradd/userdel/usermod
+#   Directory where mailboxes reside, _or_ name of file, relative to the
+#   home directory.  If you _do_ define MAIL_DIR and MAIL_FILE,
+#   MAIL_DIR takes precedence.
+#
+#   Essentially:
+#      - MAIL_DIR defines the location of users mail spool files
+#        (for mbox use) by appending the username to MAIL_DIR as defined
+#        below.
+#      - MAIL_FILE defines the location of the users mail spool files as the
+#        fully-qualified filename obtained by prepending the user home
+#        directory before $MAIL_FILE
+#
+# NOTE: This is no more used for setting up users MAIL environment variable
+#       which is, starting from shadow 4.0.12-1 in Debian, entirely the
+#       job of the pam_mail PAM modules
+#       See default PAM configuration files provided for
+#       login, su, etc.
+#
+# This is a temporary situation: setting these variables will soon
+# move to /etc/default/useradd and the variables will then be
+# no more supported
+MAIL_DIR        /var/mail
+#MAIL_FILE      .mail
+
+#
+# Enable logging and display of /var/log/faillog login failure info.
+# This option conflicts with the pam_tally PAM module.
+#
+FAILLOG_ENAB		yes
+
+#
+# Enable display of unknown usernames when login failures are recorded.
+#
+# WARNING: Unknown usernames may become world readable. 
+# See #290803 and #298773 for details about how this could become a security
+# concern
+LOG_UNKFAIL_ENAB	no
+
+#
+# Enable logging of successful logins
+#
+LOG_OK_LOGINS		no
+
+#
+# Enable "syslog" logging of su activity - in addition to sulog file logging.
+# SYSLOG_SG_ENAB does the same for newgrp and sg.
+#
+SYSLOG_SU_ENAB		yes
+SYSLOG_SG_ENAB		yes
+
+#
+# If defined, all su activity is logged to this file.
+#
+#SULOG_FILE	/var/log/sulog
+
+#
+# If defined, file which maps tty line to TERM environment parameter.
+# Each line of the file is in a format something like "vt100  tty01".
+#
+#TTYTYPE_FILE	/etc/ttytype
+
+#
+# If defined, login failures will be logged here in a utmp format
+# last, when invoked as lastb, will read /var/log/btmp, so...
+#
+FTMP_FILE	/var/log/btmp
+
+#
+# If defined, the command name to display when running "su -".  For
+# example, if this is defined as "su" then a "ps" will display the
+# command is "-su".  If not defined, then "ps" would display the
+# name of the shell actually being run, e.g. something like "-sh".
+#
+SU_NAME		su
+
+#
+# If defined, file which inhibits all the usual chatter during the login
+# sequence.  If a full pathname, then hushed mode will be enabled if the
+# user's name or shell are found in the file.  If not a full pathname, then
+# hushed mode will be enabled if the file exists in the user's home directory.
+#
+HUSHLOGIN_FILE	.hushlogin
+#HUSHLOGIN_FILE	/etc/hushlogins
+
+#
+# *REQUIRED*  The default PATH settings, for superuser and normal users.
+#
+# (they are minimal, add the rest in the shell startup files)
+ENV_SUPATH	PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV_PATH	PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games
+
+#
+# Terminal permissions
+#
+#	TTYGROUP	Login tty will be assigned this group ownership.
+#	TTYPERM		Login tty will be set to this permission.
+#
+# If you have a "write" program which is "setgid" to a special group
+# which owns the terminals, define TTYGROUP to the group number and
+# TTYPERM to 0620.  Otherwise leave TTYGROUP commented out and assign
+# TTYPERM to either 622 or 600.
+#
+# In Debian /usr/bin/bsd-write or similar programs are setgid tty
+# However, the default and recommended value for TTYPERM is still 0600
+# to not allow anyone to write to anyone else console or terminal
+
+# Users can still allow other people to write them by issuing 
+# the "mesg y" command.
+
+TTYGROUP	tty
+TTYPERM		0600
+
+#
+# Login configuration initializations:
+#
+#	ERASECHAR	Terminal ERASE character ('\010' = backspace).
+#	KILLCHAR	Terminal KILL character ('\025' = CTRL/U).
+#	UMASK		Default "umask" value.
+#
+# The ERASECHAR and KILLCHAR are used only on System V machines.
+# 
+# UMASK is the default umask value for pam_umask and is used by
+# useradd and newusers to set the mode of the new home directories.
+# 022 is the "historical" value in Debian for UMASK
+# 027, or even 077, could be considered better for privacy
+# There is no One True Answer here : each sysadmin must make up his/her
+# mind.
+#
+# Prefix these values with "0" to get octal, "0x" to get hexadecimal.
+#
+ERASECHAR	0177
+KILLCHAR	025
+UMASK		022
+
+#
+# Password aging controls:
+#
+#	PASS_MAX_DAYS	Maximum number of days a password may be used.
+#	PASS_MIN_DAYS	Minimum number of days allowed between password changes.
+#	PASS_WARN_AGE	Number of days warning given before a password expires.
+#
+PASS_MAX_DAYS	99999
+PASS_MIN_DAYS	0
+PASS_WARN_AGE	7
+
+#
+# Min/max values for automatic uid selection in useradd
+#
+UID_MIN			 2000
+UID_MAX			60000
+# System accounts
+#SYS_UID_MIN		  100
+#SYS_UID_MAX		  999
+
+#
+# Min/max values for automatic gid selection in groupadd
+#
+GID_MIN			 2000
+GID_MAX			60000
+# System accounts
+#SYS_GID_MIN		  100
+#SYS_GID_MAX		  999
+
+#
+# Max number of login retries if password is bad. This will most likely be
+# overriden by PAM, since the default pam_unix module has it's own built
+# in of 3 retries. However, this is a safe fallback in case you are using
+# an authentication module that does not enforce PAM_MAXTRIES.
+#
+LOGIN_RETRIES		5
+
+#
+# Max time in seconds for login
+#
+LOGIN_TIMEOUT		60
+
+#
+# Which fields may be changed by regular users using chfn - use
+# any combination of letters "frwh" (full name, room number, work
+# phone, home phone).  If not defined, no changes are allowed.
+# For backward compatibility, "yes" = "rwh" and "no" = "frwh".
+# 
+CHFN_RESTRICT		rwh
+
+#
+# Should login be allowed if we can't cd to the home directory?
+# Default in no.
+#
+DEFAULT_HOME	yes
+
+#
+# If defined, this command is run when removing a user.
+# It should remove any at/cron/print jobs etc. owned by
+# the user to be removed (passed as the first argument).
+#
+#USERDEL_CMD	/usr/sbin/userdel_local
+
+#
+# If set to yes, userdel will remove the user´s group if it contains no
+# more members, and useradd will create by default a group with the name
+# of the user.
+#
+# Other former uses of this variable such as setting the umask when
+# user==primary group are not used in PAM environments, such as Debian
+#
+USERGROUPS_ENAB yes
+
+#
+# Instead of the real user shell, the program specified by this parameter
+# will be launched, although its visible name (argv[0]) will be the shell's.
+# The program may do whatever it wants (logging, additional authentification,
+# banner, ...) before running the actual shell.
+#
+# FAKE_SHELL /bin/fakeshell
+
+#
+# If defined, either full pathname of a file containing device names or
+# a ":" delimited list of device names.  Root logins will be allowed only
+# upon these devices.
+#
+# This variable is used by login and su.
+#
+#CONSOLE	/etc/consoles
+#CONSOLE	console:tty01:tty02:tty03:tty04
+
+#
+# List of groups to add to the user's supplementary group set
+# when logging in on the console (as determined by the CONSOLE
+# setting).  Default is none.
+#
+# Use with caution - it is possible for users to gain permanent
+# access to these groups, even when not logged in on the console.
+# How to do it is left as an exercise for the reader...
+#
+# This variable is used by login and su.
+#
+#CONSOLE_GROUPS		floppy:audio:cdrom
+
+#
+# If set to "yes", new passwords will be encrypted using the MD5-based
+# algorithm compatible with the one used by recent releases of FreeBSD.
+# It supports passwords of unlimited length and longer salt strings.
+# Set to "no" if you need to copy encrypted passwords to other systems
+# which don't understand the new algorithm.  Default is "no".
+#
+# This variable is deprecated. You should use ENCRYPT_METHOD.
+#
+#MD5_CRYPT_ENAB	no
+
+#
+# If set to MD5 , MD5-based algorithm will be used for encrypting password
+# If set to SHA256, SHA256-based algorithm will be used for encrypting password
+# If set to SHA512, SHA512-based algorithm will be used for encrypting password
+# If set to DES, DES-based algorithm will be used for encrypting password (default)
+# Overrides the MD5_CRYPT_ENAB option
+#
+# Note: It is recommended to use a value consistent with
+# the PAM modules configuration.
+#
+ENCRYPT_METHOD SHA512
+
+#
+# Only used if ENCRYPT_METHOD is set to SHA256 or SHA512.
+#
+# Define the number of SHA rounds.
+# With a lot of rounds, it is more difficult to brute forcing the password.
+# But note also that it more CPU resources will be needed to authenticate
+# users.
+#
+# If not specified, the libc will choose the default number of rounds (5000).
+# The values must be inside the 1000-999999999 range.
+# If only one of the MIN or MAX values is set, then this value will be used.
+# If MIN > MAX, the highest value will be used.
+#
+# SHA_CRYPT_MIN_ROUNDS 5000
+# SHA_CRYPT_MAX_ROUNDS 5000
+
+################# OBSOLETED BY PAM ##############
+#						#
+# These options are now handled by PAM. Please	#
+# edit the appropriate file in /etc/pam.d/ to	#
+# enable the equivelants of them.
+#
+###############
+
+#MOTD_FILE
+#DIALUPS_CHECK_ENAB
+#LASTLOG_ENAB
+#MAIL_CHECK_ENAB
+#OBSCURE_CHECKS_ENAB
+#PORTTIME_CHECKS_ENAB
+#SU_WHEEL_ONLY
+#CRACKLIB_DICTPATH
+#PASS_CHANGE_TRIES
+#PASS_ALWAYS_WARN
+#ENVIRON_FILE
+#NOLOGINS_FILE
+#ISSUE_FILE
+#PASS_MIN_LEN
+#PASS_MAX_LEN
+#ULIMIT
+#ENV_HZ
+#CHFN_AUTH
+#CHSH_AUTH
+#FAIL_DELAY
+
+################# OBSOLETED #######################
+#						  #
+# These options are no more handled by shadow.    #
+#                                                 #
+# Shadow utilities will display a warning if they #
+# still appear.                                   #
+#                                                 #
+###################################################
+
+# CLOSE_SESSIONS
+# LOGIN_STRING
+# NO_PASSWORD_CONSOLE
+# QMAIL_DIR
+
+
+
diff --git a/server/modules/local_accounts/etc/systemd/system/local_accounts.service b/server/modules/local_accounts/etc/systemd/system/local_accounts.service
new file mode 100644
index 00000000..37488705
--- /dev/null
+++ b/server/modules/local_accounts/etc/systemd/system/local_accounts.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Runs the OpenSLX Create Users Tool
+Wants=display-manager.service getty@tty1.service getty@ttyUSB0.service
+Before=display-manager.service getty@tty1.service getty@ttyUSB0.service
+
+[Service]
+Type=oneshot
+ExecStart=/opt/openslx/scripts/systemd-local_accounts
+RemainAfterExit=yes
diff --git a/server/modules/local_accounts/etc/systemd/system/multi-user.target.wants/local_accounts.service b/server/modules/local_accounts/etc/systemd/system/multi-user.target.wants/local_accounts.service
new file mode 120000
index 00000000..578ecc01
--- /dev/null
+++ b/server/modules/local_accounts/etc/systemd/system/multi-user.target.wants/local_accounts.service
@@ -0,0 +1 @@
+../../../../etc/systemd/system/local_accounts.service
\ No newline at end of file
diff --git a/server/modules/local_accounts/opt/openslx/scripts/local_accounts-cron_script b/server/modules/local_accounts/opt/openslx/scripts/local_accounts-cron_script
new file mode 100755
index 00000000..8d38401a
--- /dev/null
+++ b/server/modules/local_accounts/opt/openslx/scripts/local_accounts-cron_script
@@ -0,0 +1,9 @@
+#!/bin/ash
+
+# create .patches for next session
+
+if [ -d /home/openslx ]; then
+	for file in passwd shadow group; do
+		diff -u /home/openslx/.$file.backup /etc/$file > /home/openslx/.$file.patch
+	done
+fi
diff --git a/server/modules/local_accounts/opt/openslx/scripts/systemd-create_users b/server/modules/local_accounts/opt/openslx/scripts/systemd-create_users
new file mode 100755
index 00000000..3ac554b5
--- /dev/null
+++ b/server/modules/local_accounts/opt/openslx/scripts/systemd-create_users
@@ -0,0 +1,57 @@
+#!/bin/ash
+
+. /opt/openslx/config || { echo "Could not source config!"; exit 23; }
+
+create_user(){
+# generate the new lines that will be merged into the /etc/{passwd,shadow,group} files
+	unset IFS
+  if useradd -s /bin/bash -m $1 -K UID_MIN=1000 -K GID_MIN=1000; then	# if the users doesn't exists, create him without the password
+  	if [ -n "$2" ]; then
+    	sed -i "s#^$1:[^:]*:#$1:$2:#" "/etc/shadow" # set the password in the /etc/shadow file
+  	fi
+  else
+    echo 'user $1 already exists'
+    if [ -n "$2" ] && [ $(grep ^$1: /etc/shadow | cut -d ':' -f2) != $2 ]; then # if the user already exists, check if the password has changed
+      echo "changing password to the new one"
+	    sed -i "s#^$1:[^:]*:#$1:$2:#" "/etc/shadow" # set the password in the /etc/shadow file
+    fi
+  fi
+}
+
+mount | grep "/home" > /dev/null
+if [ $? -eq 0 ]; then
+  # check if the /home partition exists
+  echo "/home partition found"
+  if useradd -s /bin/bash -m openslx -K UID_MIN=1000 -K GID_MIN=1000; then	# try to create the 'openslx' user, will fail if it already exists
+    echo "user openslx created"
+    sed -i "s#^openslx:[^:]*:#openslx:$OPENSLX_PASS:#" "/etc/shadow" # set the password in the /etc/shadow file
+  fi
+
+  for line in $SLX_USERS; do 	# create the accounts specified in the SLX_USERS config.
+  	IFS=,
+  	set $line
+    create_user $1 $2
+  done
+  
+  for file in passwd shadow group; do
+    #backup files before patching to save slxbox state
+    echo "Backing up /etc/$file at /home/openslx/.$file.backup"
+    cp /etc/$file /home/openslx/.$file.backup
+
+    # apply patch of users created by the admin in the last session.
+    if [ -e /home/openslx/.$file.patch ]; then
+      patch /etc/$file < /home/openslx/.$file.patch
+    fi
+  done
+else  # if no /home partition was found, will create the user but won't do the patch and backup.
+  echo "No /home partition found on hdd. Creating non permanent users from slxbox."
+  if useradd -s /bin/bash -m openslx -K UID_MIN=1000 -K GID_MIN=1000; then	# try to create the 'openslx' user, will fail if it already exists
+    echo "user openslx created"
+    sed -i "s#^openslx:[^:]*:#openslx:$OPENSLX_PASS:#" "/etc/shadow" # set the password in the /etc/shadow file
+  fi
+  for line in $SLX_USERS; do 	# create the accounts specified in the SLX_USERS config.
+  	IFS=,
+  	set $line
+    create_user $1 $2
+  done
+fi
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 368d5b62c33d14ed619b22bae7e09e2973fdf627 Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Mon, 10 Nov 2014 11:25:53 -0200
Subject: [local-account] code review

---
 .../opt/openslx/scripts/systemd-create_users       | 73 ++++++++++++----------
 1 file changed, 41 insertions(+), 32 deletions(-)

(limited to 'server/modules')

diff --git a/server/modules/local_accounts/opt/openslx/scripts/systemd-create_users b/server/modules/local_accounts/opt/openslx/scripts/systemd-create_users
index 3ac554b5..5cabd4fd 100755
--- a/server/modules/local_accounts/opt/openslx/scripts/systemd-create_users
+++ b/server/modules/local_accounts/opt/openslx/scripts/systemd-create_users
@@ -2,56 +2,65 @@
 
 . /opt/openslx/config || { echo "Could not source config!"; exit 23; }
 
+#generate new user with useradd and insert password in /etc/shadow if exists
 create_user(){
-# generate the new lines that will be merged into the /etc/{passwd,shadow,group} files
-	unset IFS
-  if useradd -s /bin/bash -m $1 -K UID_MIN=1000 -K GID_MIN=1000; then	# if the users doesn't exists, create him without the password
-  	if [ -n "$2" ]; then
-    	sed -i "s#^$1:[^:]*:#$1:$2:#" "/etc/shadow" # set the password in the /etc/shadow file
-  	fi
+  local username="$1"
+  local password="$2"
+  uset IFS
+
+  #if the users doesn't exists, create him without the password
+  if useradd -s /bin/bash -m "$username" -K UID_MIN=1000 -K GID_MIN=1000; then
+    if [ -n "$password" ]; then
+      #set the password in the /etc/shadow file
+      sed -i "s#^${username}:[^:]*:#${username}:${password}:#" "/etc/shadow"
+    fi
   else
-    echo 'user $1 already exists'
-    if [ -n "$2" ] && [ $(grep ^$1: /etc/shadow | cut -d ':' -f2) != $2 ]; then # if the user already exists, check if the password has changed
-      echo "changing password to the new one"
-	    sed -i "s#^$1:[^:]*:#$1:$2:#" "/etc/shadow" # set the password in the /etc/shadow file
+    echo 'user ${username} already exists'
+    #if the user already exists, check if the password has changed
+    if [ -n "$password" ] && [ $(grep ^${username}: /etc/shadow | cut -d ':' -f2) != "$password" ]; then
+      echo "User password changed, updating /etc/shadow to new one"
+      #set the password in the /etc/shadow file
+      sed -i "s#^${username}:[^:]*:#${username}:${password}:#" "/etc/shadow"
     fi
   fi
 }
 
-mount | grep "/home" > /dev/null
-if [ $? -eq 0 ]; then
-  # check if the /home partition exists
+# check if the /home partition exists
+if mount | grep "/home" > /dev/null; then
   echo "/home partition found"
-  if useradd -s /bin/bash -m openslx -K UID_MIN=1000 -K GID_MIN=1000; then	# try to create the 'openslx' user, will fail if it already exists
+
+  #try to create the 'openslx' user in whose home dir backups and patch files will be stored
+  if useradd -s /bin/bash -m openslx -K UID_MIN=1000 -K GID_MIN=1000; then
     echo "user openslx created"
-    sed -i "s#^openslx:[^:]*:#openslx:$OPENSLX_PASS:#" "/etc/shadow" # set the password in the /etc/shadow file
+    #set the password in the /etc/shadow file
+    sed -i "s#^openslx:[^:]*:#openslx:$OPENSLX_PASS:#" "/etc/shadow"
   fi
 
-  for line in $SLX_USERS; do 	# create the accounts specified in the SLX_USERS config.
-  	IFS=,
-  	set $line
+  #create the accounts specified in the SLX_USERS config.
+  for line in $SLX_USERS; do
+    IFS=,
+    set $line
     create_user $1 $2
   done
-  
+
+  #patch passwd, shadow and group with changes the local admin made in that machine
   for file in passwd shadow group; do
     #backup files before patching to save slxbox state
-    echo "Backing up /etc/$file at /home/openslx/.$file.backup"
-    cp /etc/$file /home/openslx/.$file.backup
+    echo "Backing up /etc/${file} at /home/openslx/.${file}.backup"
+    cp /etc/${file} /home/openslx/.${file}.backup
 
-    # apply patch of users created by the admin in the last session.
-    if [ -e /home/openslx/.$file.patch ]; then
-      patch /etc/$file < /home/openslx/.$file.patch
+    #apply patch of users created by the admin in the last session.
+    if [ -e /home/openslx/.${file}.patch ]; then
+      patch /etc/${file} < /home/openslx/.${file}.patch
     fi
   done
-else  # if no /home partition was found, will create the user but won't do the patch and backup.
+
+else
+  #if no /home partition was found, will create the user but won't do the patch and backup.
   echo "No /home partition found on hdd. Creating non permanent users from slxbox."
-  if useradd -s /bin/bash -m openslx -K UID_MIN=1000 -K GID_MIN=1000; then	# try to create the 'openslx' user, will fail if it already exists
-    echo "user openslx created"
-    sed -i "s#^openslx:[^:]*:#openslx:$OPENSLX_PASS:#" "/etc/shadow" # set the password in the /etc/shadow file
-  fi
   for line in $SLX_USERS; do 	# create the accounts specified in the SLX_USERS config.
-  	IFS=,
-  	set $line
+    IFS=,
+    set $line
     create_user $1 $2
   done
-fi
\ No newline at end of file
+fi
-- 
cgit v1.2.3-55-g7522


From 0c9ae7ba033687de2e1eea5e2a12c190a561c01a Mon Sep 17 00:00:00 2001
From: Michael Pereira Neves
Date: Tue, 11 Nov 2014 18:34:21 -0200
Subject: [local-account] rename systemd script for local accounts

---
 .../opt/openslx/scripts/systemd-create_users       | 66 ----------------------
 .../opt/openslx/scripts/systemd-local_accounts     | 66 ++++++++++++++++++++++
 2 files changed, 66 insertions(+), 66 deletions(-)
 delete mode 100755 server/modules/local_accounts/opt/openslx/scripts/systemd-create_users
 create mode 100755 server/modules/local_accounts/opt/openslx/scripts/systemd-local_accounts

(limited to 'server/modules')

diff --git a/server/modules/local_accounts/opt/openslx/scripts/systemd-create_users b/server/modules/local_accounts/opt/openslx/scripts/systemd-create_users
deleted file mode 100755
index 5cabd4fd..00000000
--- a/server/modules/local_accounts/opt/openslx/scripts/systemd-create_users
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/ash
-
-. /opt/openslx/config || { echo "Could not source config!"; exit 23; }
-
-#generate new user with useradd and insert password in /etc/shadow if exists
-create_user(){
-  local username="$1"
-  local password="$2"
-  uset IFS
-
-  #if the users doesn't exists, create him without the password
-  if useradd -s /bin/bash -m "$username" -K UID_MIN=1000 -K GID_MIN=1000; then
-    if [ -n "$password" ]; then
-      #set the password in the /etc/shadow file
-      sed -i "s#^${username}:[^:]*:#${username}:${password}:#" "/etc/shadow"
-    fi
-  else
-    echo 'user ${username} already exists'
-    #if the user already exists, check if the password has changed
-    if [ -n "$password" ] && [ $(grep ^${username}: /etc/shadow | cut -d ':' -f2) != "$password" ]; then
-      echo "User password changed, updating /etc/shadow to new one"
-      #set the password in the /etc/shadow file
-      sed -i "s#^${username}:[^:]*:#${username}:${password}:#" "/etc/shadow"
-    fi
-  fi
-}
-
-# check if the /home partition exists
-if mount | grep "/home" > /dev/null; then
-  echo "/home partition found"
-
-  #try to create the 'openslx' user in whose home dir backups and patch files will be stored
-  if useradd -s /bin/bash -m openslx -K UID_MIN=1000 -K GID_MIN=1000; then
-    echo "user openslx created"
-    #set the password in the /etc/shadow file
-    sed -i "s#^openslx:[^:]*:#openslx:$OPENSLX_PASS:#" "/etc/shadow"
-  fi
-
-  #create the accounts specified in the SLX_USERS config.
-  for line in $SLX_USERS; do
-    IFS=,
-    set $line
-    create_user $1 $2
-  done
-
-  #patch passwd, shadow and group with changes the local admin made in that machine
-  for file in passwd shadow group; do
-    #backup files before patching to save slxbox state
-    echo "Backing up /etc/${file} at /home/openslx/.${file}.backup"
-    cp /etc/${file} /home/openslx/.${file}.backup
-
-    #apply patch of users created by the admin in the last session.
-    if [ -e /home/openslx/.${file}.patch ]; then
-      patch /etc/${file} < /home/openslx/.${file}.patch
-    fi
-  done
-
-else
-  #if no /home partition was found, will create the user but won't do the patch and backup.
-  echo "No /home partition found on hdd. Creating non permanent users from slxbox."
-  for line in $SLX_USERS; do 	# create the accounts specified in the SLX_USERS config.
-    IFS=,
-    set $line
-    create_user $1 $2
-  done
-fi
diff --git a/server/modules/local_accounts/opt/openslx/scripts/systemd-local_accounts b/server/modules/local_accounts/opt/openslx/scripts/systemd-local_accounts
new file mode 100755
index 00000000..5cabd4fd
--- /dev/null
+++ b/server/modules/local_accounts/opt/openslx/scripts/systemd-local_accounts
@@ -0,0 +1,66 @@
+#!/bin/ash
+
+. /opt/openslx/config || { echo "Could not source config!"; exit 23; }
+
+#generate new user with useradd and insert password in /etc/shadow if exists
+create_user(){
+  local username="$1"
+  local password="$2"
+  uset IFS
+
+  #if the users doesn't exists, create him without the password
+  if useradd -s /bin/bash -m "$username" -K UID_MIN=1000 -K GID_MIN=1000; then
+    if [ -n "$password" ]; then
+      #set the password in the /etc/shadow file
+      sed -i "s#^${username}:[^:]*:#${username}:${password}:#" "/etc/shadow"
+    fi
+  else
+    echo 'user ${username} already exists'
+    #if the user already exists, check if the password has changed
+    if [ -n "$password" ] && [ $(grep ^${username}: /etc/shadow | cut -d ':' -f2) != "$password" ]; then
+      echo "User password changed, updating /etc/shadow to new one"
+      #set the password in the /etc/shadow file
+      sed -i "s#^${username}:[^:]*:#${username}:${password}:#" "/etc/shadow"
+    fi
+  fi
+}
+
+# check if the /home partition exists
+if mount | grep "/home" > /dev/null; then
+  echo "/home partition found"
+
+  #try to create the 'openslx' user in whose home dir backups and patch files will be stored
+  if useradd -s /bin/bash -m openslx -K UID_MIN=1000 -K GID_MIN=1000; then
+    echo "user openslx created"
+    #set the password in the /etc/shadow file
+    sed -i "s#^openslx:[^:]*:#openslx:$OPENSLX_PASS:#" "/etc/shadow"
+  fi
+
+  #create the accounts specified in the SLX_USERS config.
+  for line in $SLX_USERS; do
+    IFS=,
+    set $line
+    create_user $1 $2
+  done
+
+  #patch passwd, shadow and group with changes the local admin made in that machine
+  for file in passwd shadow group; do
+    #backup files before patching to save slxbox state
+    echo "Backing up /etc/${file} at /home/openslx/.${file}.backup"
+    cp /etc/${file} /home/openslx/.${file}.backup
+
+    #apply patch of users created by the admin in the last session.
+    if [ -e /home/openslx/.${file}.patch ]; then
+      patch /etc/${file} < /home/openslx/.${file}.patch
+    fi
+  done
+
+else
+  #if no /home partition was found, will create the user but won't do the patch and backup.
+  echo "No /home partition found on hdd. Creating non permanent users from slxbox."
+  for line in $SLX_USERS; do 	# create the accounts specified in the SLX_USERS config.
+    IFS=,
+    set $line
+    create_user $1 $2
+  done
+fi
-- 
cgit v1.2.3-55-g7522


From 50730a0dcb5ebc41bfe15c2d98a9ad25806f4442 Mon Sep 17 00:00:00 2001
From: Tiago
Date: Mon, 10 Nov 2014 13:15:19 -0200
Subject: [hdd-boot] Add grubmenumaker script and init changes

---
 remote/modules/grub/data/etc/grub/gfxblacklist.txt |  19 ++
 remote/modules/grub/data/etc/grub/grub.cfg         | 192 +++++++++++++++
 .../modules/grub/data/etc/grub/grub.default.style  |  27 +++
 remote/modules/grub/data/etc/grub/grubenv          |   2 +
 .../grub/data/etc/grub/i386-pc/915resolution.mod   | Bin 0 -> 7980 bytes
 remote/modules/grub/data/etc/grub/i386-pc/acpi.mod | Bin 0 -> 9952 bytes
 .../modules/grub/data/etc/grub/i386-pc/adler32.mod | Bin 0 -> 1312 bytes
 remote/modules/grub/data/etc/grub/i386-pc/affs.mod | Bin 0 -> 5768 bytes
 remote/modules/grub/data/etc/grub/i386-pc/afs.mod  | Bin 0 -> 6668 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ahci.mod | Bin 0 -> 15408 bytes
 .../grub/data/etc/grub/i386-pc/all_video.mod       | Bin 0 -> 701 bytes
 remote/modules/grub/data/etc/grub/i386-pc/aout.mod | Bin 0 -> 1048 bytes
 .../modules/grub/data/etc/grub/i386-pc/archelp.mod | Bin 0 -> 2940 bytes
 .../grub/data/etc/grub/i386-pc/at_keyboard.mod     | Bin 0 -> 4248 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ata.mod  | Bin 0 -> 5652 bytes
 .../grub/data/etc/grub/i386-pc/backtrace.mod       | Bin 0 -> 1632 bytes
 remote/modules/grub/data/etc/grub/i386-pc/bfs.mod  | Bin 0 -> 7252 bytes
 .../grub/data/etc/grub/i386-pc/biosdisk.mod        | Bin 0 -> 4660 bytes
 .../modules/grub/data/etc/grub/i386-pc/bitmap.mod  | Bin 0 -> 2244 bytes
 .../grub/data/etc/grub/i386-pc/bitmap_scale.mod    | Bin 0 -> 3636 bytes
 .../grub/data/etc/grub/i386-pc/blocklist.mod       | Bin 0 -> 2152 bytes
 remote/modules/grub/data/etc/grub/i386-pc/boot.img | Bin 0 -> 512 bytes
 remote/modules/grub/data/etc/grub/i386-pc/boot.mod | Bin 0 -> 2456 bytes
 remote/modules/grub/data/etc/grub/i386-pc/bsd.mod  | Bin 0 -> 30072 bytes
 .../modules/grub/data/etc/grub/i386-pc/btrfs.mod   | Bin 0 -> 14452 bytes
 .../modules/grub/data/etc/grub/i386-pc/bufio.mod   | Bin 0 -> 2108 bytes
 remote/modules/grub/data/etc/grub/i386-pc/cat.mod  | Bin 0 -> 2876 bytes
 remote/modules/grub/data/etc/grub/i386-pc/cbfs.mod | Bin 0 -> 3744 bytes
 remote/modules/grub/data/etc/grub/i386-pc/cbls.mod | Bin 0 -> 3584 bytes
 .../modules/grub/data/etc/grub/i386-pc/cbmemc.mod  | Bin 0 -> 2384 bytes
 .../modules/grub/data/etc/grub/i386-pc/cbtable.mod | Bin 0 -> 1072 bytes
 .../modules/grub/data/etc/grub/i386-pc/cbtime.mod  | Bin 0 -> 2556 bytes
 .../modules/grub/data/etc/grub/i386-pc/chain.mod   | Bin 0 -> 3504 bytes
 .../data/etc/grub/i386-pc/cmdline_cat_test.mod     | Bin 0 -> 3040 bytes
 .../grub/data/etc/grub/i386-pc/cmosdump.mod        | Bin 0 -> 1216 bytes
 .../grub/data/etc/grub/i386-pc/cmostest.mod        | Bin 0 -> 1836 bytes
 remote/modules/grub/data/etc/grub/i386-pc/cmp.mod  | Bin 0 -> 1984 bytes
 .../modules/grub/data/etc/grub/i386-pc/command.lst | 199 ++++++++++++++++
 .../grub/data/etc/grub/i386-pc/configfile.mod      | Bin 0 -> 2264 bytes
 remote/modules/grub/data/etc/grub/i386-pc/core.img | Bin 0 -> 25568 bytes
 remote/modules/grub/data/etc/grub/i386-pc/cpio.mod | Bin 0 -> 2644 bytes
 .../modules/grub/data/etc/grub/i386-pc/cpio_be.mod | Bin 0 -> 2744 bytes
 .../modules/grub/data/etc/grub/i386-pc/cpuid.mod   | Bin 0 -> 1720 bytes
 .../modules/grub/data/etc/grub/i386-pc/crc64.mod   | Bin 0 -> 1672 bytes
 .../modules/grub/data/etc/grub/i386-pc/crypto.lst  |  45 ++++
 .../modules/grub/data/etc/grub/i386-pc/crypto.mod  | Bin 0 -> 4916 bytes
 .../grub/data/etc/grub/i386-pc/cryptodisk.mod      | Bin 0 -> 10032 bytes
 .../modules/grub/data/etc/grub/i386-pc/cs5536.mod  | Bin 0 -> 3904 bytes
 remote/modules/grub/data/etc/grub/i386-pc/date.mod | Bin 0 -> 2172 bytes
 .../grub/data/etc/grub/i386-pc/datehook.mod        | Bin 0 -> 1788 bytes
 .../grub/data/etc/grub/i386-pc/datetime.mod        | Bin 0 -> 1269 bytes
 remote/modules/grub/data/etc/grub/i386-pc/disk.mod | Bin 0 -> 2380 bytes
 .../grub/data/etc/grub/i386-pc/diskfilter.mod      | Bin 0 -> 9764 bytes
 .../grub/data/etc/grub/i386-pc/div_test.mod        | Bin 0 -> 3848 bytes
 .../modules/grub/data/etc/grub/i386-pc/dm_nv.mod   | Bin 0 -> 1828 bytes
 .../grub/data/etc/grub/i386-pc/drivemap.mod        | Bin 0 -> 5404 bytes
 remote/modules/grub/data/etc/grub/i386-pc/echo.mod | Bin 0 -> 1984 bytes
 .../modules/grub/data/etc/grub/i386-pc/efiemu.mod  | Bin 0 -> 23960 bytes
 .../modules/grub/data/etc/grub/i386-pc/efiemu32.o  | Bin 0 -> 7424 bytes
 .../modules/grub/data/etc/grub/i386-pc/efiemu64.o  | Bin 0 -> 11313 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ehci.mod | Bin 0 -> 15972 bytes
 remote/modules/grub/data/etc/grub/i386-pc/elf.mod  | Bin 0 -> 5116 bytes
 remote/modules/grub/data/etc/grub/i386-pc/eval.mod | Bin 0 -> 1436 bytes
 .../modules/grub/data/etc/grub/i386-pc/exfat.mod   | Bin 0 -> 5508 bytes
 .../grub/data/etc/grub/i386-pc/exfctest.mod        | Bin 0 -> 1468 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ext2.mod | Bin 0 -> 5608 bytes
 .../modules/grub/data/etc/grub/i386-pc/extcmd.mod  | Bin 0 -> 4512 bytes
 remote/modules/grub/data/etc/grub/i386-pc/fat.mod  | Bin 0 -> 5628 bytes
 remote/modules/grub/data/etc/grub/i386-pc/file.mod | Bin 0 -> 16084 bytes
 remote/modules/grub/data/etc/grub/i386-pc/font.mod | Bin 0 -> 12472 bytes
 .../modules/grub/data/etc/grub/i386-pc/freedos.mod | Bin 0 -> 2664 bytes
 remote/modules/grub/data/etc/grub/i386-pc/fs.lst   |  36 +++
 .../modules/grub/data/etc/grub/i386-pc/fshelp.mod  | Bin 0 -> 2568 bytes
 .../grub/data/etc/grub/i386-pc/functional_test.mod | Bin 0 -> 89748 bytes
 .../grub/data/etc/grub/i386-pc/gcry_arcfour.mod    | Bin 0 -> 1612 bytes
 .../grub/data/etc/grub/i386-pc/gcry_blowfish.mod   | Bin 0 -> 8096 bytes
 .../grub/data/etc/grub/i386-pc/gcry_camellia.mod   | Bin 0 -> 34124 bytes
 .../grub/data/etc/grub/i386-pc/gcry_cast5.mod      | Bin 0 -> 16836 bytes
 .../grub/data/etc/grub/i386-pc/gcry_crc.mod        | Bin 0 -> 2912 bytes
 .../grub/data/etc/grub/i386-pc/gcry_des.mod        | Bin 0 -> 19308 bytes
 .../grub/data/etc/grub/i386-pc/gcry_dsa.mod        | Bin 0 -> 2264 bytes
 .../grub/data/etc/grub/i386-pc/gcry_idea.mod       | Bin 0 -> 2976 bytes
 .../grub/data/etc/grub/i386-pc/gcry_md4.mod        | Bin 0 -> 3124 bytes
 .../grub/data/etc/grub/i386-pc/gcry_md5.mod        | Bin 0 -> 3760 bytes
 .../grub/data/etc/grub/i386-pc/gcry_rfc2268.mod    | Bin 0 -> 2496 bytes
 .../grub/data/etc/grub/i386-pc/gcry_rijndael.mod   | Bin 0 -> 19076 bytes
 .../grub/data/etc/grub/i386-pc/gcry_rmd160.mod     | Bin 0 -> 8108 bytes
 .../grub/data/etc/grub/i386-pc/gcry_rsa.mod        | Bin 0 -> 2068 bytes
 .../grub/data/etc/grub/i386-pc/gcry_seed.mod       | Bin 0 -> 15636 bytes
 .../grub/data/etc/grub/i386-pc/gcry_serpent.mod    | Bin 0 -> 16124 bytes
 .../grub/data/etc/grub/i386-pc/gcry_sha1.mod       | Bin 0 -> 7460 bytes
 .../grub/data/etc/grub/i386-pc/gcry_sha256.mod     | Bin 0 -> 4348 bytes
 .../grub/data/etc/grub/i386-pc/gcry_sha512.mod     | Bin 0 -> 7988 bytes
 .../grub/data/etc/grub/i386-pc/gcry_tiger.mod      | Bin 0 -> 12536 bytes
 .../grub/data/etc/grub/i386-pc/gcry_twofish.mod    | Bin 0 -> 39376 bytes
 .../grub/data/etc/grub/i386-pc/gcry_whirlpool.mod  | Bin 0 -> 24688 bytes
 remote/modules/grub/data/etc/grub/i386-pc/gdb.mod  | Bin 0 -> 25228 bytes
 remote/modules/grub/data/etc/grub/i386-pc/geli.mod | Bin 0 -> 5848 bytes
 .../modules/grub/data/etc/grub/i386-pc/gettext.mod | Bin 0 -> 4964 bytes
 .../modules/grub/data/etc/grub/i386-pc/gfxmenu.mod | Bin 0 -> 39256 bytes
 .../modules/grub/data/etc/grub/i386-pc/gfxterm.mod | Bin 0 -> 9952 bytes
 .../data/etc/grub/i386-pc/gfxterm_background.mod   | Bin 0 -> 2864 bytes
 .../grub/data/etc/grub/i386-pc/gfxterm_menu.mod    | Bin 0 -> 5032 bytes
 .../modules/grub/data/etc/grub/i386-pc/gptsync.mod | Bin 0 -> 3764 bytes
 remote/modules/grub/data/etc/grub/i386-pc/gzio.mod | Bin 0 -> 8224 bytes
 remote/modules/grub/data/etc/grub/i386-pc/halt.mod | Bin 0 -> 4336 bytes
 .../modules/grub/data/etc/grub/i386-pc/hashsum.mod | Bin 0 -> 5216 bytes
 .../modules/grub/data/etc/grub/i386-pc/hdparm.mod  | Bin 0 -> 7208 bytes
 .../modules/grub/data/etc/grub/i386-pc/hello.mod   | Bin 0 -> 1204 bytes
 remote/modules/grub/data/etc/grub/i386-pc/help.mod | Bin 0 -> 2576 bytes
 .../modules/grub/data/etc/grub/i386-pc/hexdump.mod | Bin 0 -> 3168 bytes
 remote/modules/grub/data/etc/grub/i386-pc/hfs.mod  | Bin 0 -> 7144 bytes
 .../modules/grub/data/etc/grub/i386-pc/hfsplus.mod | Bin 0 -> 7576 bytes
 .../grub/data/etc/grub/i386-pc/hfspluscomp.mod     | Bin 0 -> 2956 bytes
 remote/modules/grub/data/etc/grub/i386-pc/http.mod | Bin 0 -> 5564 bytes
 .../modules/grub/data/etc/grub/i386-pc/hwmatch.mod | Bin 0 -> 47288 bytes
 remote/modules/grub/data/etc/grub/i386-pc/iorw.mod | Bin 0 -> 2836 bytes
 .../modules/grub/data/etc/grub/i386-pc/iso9660.mod | Bin 0 -> 8616 bytes
 remote/modules/grub/data/etc/grub/i386-pc/jfs.mod  | Bin 0 -> 6176 bytes
 remote/modules/grub/data/etc/grub/i386-pc/jpeg.mod | Bin 0 -> 6236 bytes
 .../grub/data/etc/grub/i386-pc/keylayouts.mod      | Bin 0 -> 5004 bytes
 .../grub/data/etc/grub/i386-pc/keystatus.mod       | Bin 0 -> 1948 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ldm.mod  | Bin 0 -> 6864 bytes
 .../data/etc/grub/i386-pc/legacy_password_test.mod | Bin 0 -> 14480 bytes
 .../grub/data/etc/grub/i386-pc/legacycfg.mod       | Bin 0 -> 29856 bytes
 .../modules/grub/data/etc/grub/i386-pc/linux.mod   | Bin 0 -> 13076 bytes
 .../modules/grub/data/etc/grub/i386-pc/linux16.mod | Bin 0 -> 7920 bytes
 .../modules/grub/data/etc/grub/i386-pc/loadenv.mod | Bin 0 -> 5988 bytes
 .../grub/data/etc/grub/i386-pc/loopback.mod        | Bin 0 -> 2984 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ls.mod   | Bin 0 -> 4052 bytes
 .../modules/grub/data/etc/grub/i386-pc/lsacpi.mod  | Bin 0 -> 4788 bytes
 .../modules/grub/data/etc/grub/i386-pc/lsapm.mod   | Bin 0 -> 2280 bytes
 .../modules/grub/data/etc/grub/i386-pc/lsmmap.mod  | Bin 0 -> 1780 bytes
 .../modules/grub/data/etc/grub/i386-pc/lspci.mod   | Bin 0 -> 4824 bytes
 remote/modules/grub/data/etc/grub/i386-pc/luks.mod | Bin 0 -> 6660 bytes
 remote/modules/grub/data/etc/grub/i386-pc/lvm.mod  | Bin 0 -> 6768 bytes
 .../modules/grub/data/etc/grub/i386-pc/lzopio.mod  | Bin 0 -> 8668 bytes
 .../grub/data/etc/grub/i386-pc/macbless.mod        | Bin 0 -> 3308 bytes
 .../modules/grub/data/etc/grub/i386-pc/macho.mod   | Bin 0 -> 7516 bytes
 .../grub/data/etc/grub/i386-pc/mda_text.mod        | Bin 0 -> 2036 bytes
 .../grub/data/etc/grub/i386-pc/mdraid09.mod        | Bin 0 -> 1960 bytes
 .../grub/data/etc/grub/i386-pc/mdraid09_be.mod     | Bin 0 -> 2040 bytes
 .../grub/data/etc/grub/i386-pc/mdraid1x.mod        | Bin 0 -> 1968 bytes
 .../modules/grub/data/etc/grub/i386-pc/memdisk.mod | Bin 0 -> 2004 bytes
 .../modules/grub/data/etc/grub/i386-pc/memrw.mod   | Bin 0 -> 2836 bytes
 .../modules/grub/data/etc/grub/i386-pc/minicmd.mod | Bin 0 -> 3436 bytes
 .../modules/grub/data/etc/grub/i386-pc/minix.mod   | Bin 0 -> 3504 bytes
 .../modules/grub/data/etc/grub/i386-pc/minix2.mod  | Bin 0 -> 3568 bytes
 .../grub/data/etc/grub/i386-pc/minix2_be.mod       | Bin 0 -> 3732 bytes
 .../modules/grub/data/etc/grub/i386-pc/minix3.mod  | Bin 0 -> 3536 bytes
 .../grub/data/etc/grub/i386-pc/minix3_be.mod       | Bin 0 -> 3704 bytes
 .../grub/data/etc/grub/i386-pc/minix_be.mod        | Bin 0 -> 3636 bytes
 remote/modules/grub/data/etc/grub/i386-pc/mmap.mod | Bin 0 -> 8504 bytes
 .../modules/grub/data/etc/grub/i386-pc/moddep.lst  | 259 +++++++++++++++++++++
 .../modules/grub/data/etc/grub/i386-pc/modinfo.sh  |  36 +++
 .../modules/grub/data/etc/grub/i386-pc/morse.mod   | Bin 0 -> 2368 bytes
 remote/modules/grub/data/etc/grub/i386-pc/mpi.mod  | Bin 0 -> 27840 bytes
 .../grub/data/etc/grub/i386-pc/msdospart.mod       | Bin 0 -> 2396 bytes
 .../grub/data/etc/grub/i386-pc/multiboot.mod       | Bin 0 -> 12876 bytes
 .../grub/data/etc/grub/i386-pc/multiboot2.mod      | Bin 0 -> 13284 bytes
 .../grub/data/etc/grub/i386-pc/nativedisk.mod      | Bin 0 -> 4064 bytes
 remote/modules/grub/data/etc/grub/i386-pc/net.mod  | Bin 0 -> 46628 bytes
 remote/modules/grub/data/etc/grub/i386-pc/newc.mod | Bin 0 -> 2916 bytes
 .../modules/grub/data/etc/grub/i386-pc/nilfs2.mod  | Bin 0 -> 6732 bytes
 .../modules/grub/data/etc/grub/i386-pc/normal.mod  | Bin 0 -> 115868 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ntfs.mod | Bin 0 -> 9920 bytes
 .../grub/data/etc/grub/i386-pc/ntfscomp.mod        | Bin 0 -> 4324 bytes
 .../modules/grub/data/etc/grub/i386-pc/ntldr.mod   | Bin 0 -> 2556 bytes
 remote/modules/grub/data/etc/grub/i386-pc/odc.mod  | Bin 0 -> 2728 bytes
 .../grub/data/etc/grub/i386-pc/offsetio.mod        | Bin 0 -> 1508 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ohci.mod | Bin 0 -> 10540 bytes
 .../grub/data/etc/grub/i386-pc/part_acorn.mod      | Bin 0 -> 1668 bytes
 .../grub/data/etc/grub/i386-pc/part_amiga.mod      | Bin 0 -> 1860 bytes
 .../grub/data/etc/grub/i386-pc/part_apple.mod      | Bin 0 -> 2112 bytes
 .../grub/data/etc/grub/i386-pc/part_bsd.mod        | Bin 0 -> 2752 bytes
 .../grub/data/etc/grub/i386-pc/part_dfly.mod       | Bin 0 -> 1732 bytes
 .../grub/data/etc/grub/i386-pc/part_dvh.mod        | Bin 0 -> 1480 bytes
 .../grub/data/etc/grub/i386-pc/part_gpt.mod        | Bin 0 -> 2372 bytes
 .../grub/data/etc/grub/i386-pc/part_msdos.mod      | Bin 0 -> 2344 bytes
 .../grub/data/etc/grub/i386-pc/part_plan.mod       | Bin 0 -> 1800 bytes
 .../grub/data/etc/grub/i386-pc/part_sun.mod        | Bin 0 -> 1524 bytes
 .../grub/data/etc/grub/i386-pc/part_sunpc.mod      | Bin 0 -> 1620 bytes
 .../modules/grub/data/etc/grub/i386-pc/partmap.lst |  11 +
 .../grub/data/etc/grub/i386-pc/parttool.lst        |   1 +
 .../grub/data/etc/grub/i386-pc/parttool.mod        | Bin 0 -> 4620 bytes
 .../grub/data/etc/grub/i386-pc/password.mod        | Bin 0 -> 1896 bytes
 .../grub/data/etc/grub/i386-pc/password_pbkdf2.mod | Bin 0 -> 2800 bytes
 remote/modules/grub/data/etc/grub/i386-pc/pata.mod | Bin 0 -> 4792 bytes
 .../modules/grub/data/etc/grub/i386-pc/pbkdf2.mod  | Bin 0 -> 1460 bytes
 .../grub/data/etc/grub/i386-pc/pbkdf2_test.mod     | Bin 0 -> 2224 bytes
 remote/modules/grub/data/etc/grub/i386-pc/pci.mod  | Bin 0 -> 1396 bytes
 .../modules/grub/data/etc/grub/i386-pc/pcidump.mod | Bin 0 -> 2460 bytes
 .../modules/grub/data/etc/grub/i386-pc/plan9.mod   | Bin 0 -> 6208 bytes
 remote/modules/grub/data/etc/grub/i386-pc/play.mod | Bin 0 -> 2424 bytes
 remote/modules/grub/data/etc/grub/i386-pc/png.mod  | Bin 0 -> 7392 bytes
 .../grub/data/etc/grub/i386-pc/priority_queue.mod  | Bin 0 -> 1556 bytes
 .../modules/grub/data/etc/grub/i386-pc/probe.mod   | Bin 0 -> 2680 bytes
 .../modules/grub/data/etc/grub/i386-pc/procfs.mod  | Bin 0 -> 2112 bytes
 .../grub/data/etc/grub/i386-pc/progress.mod        | Bin 0 -> 2064 bytes
 remote/modules/grub/data/etc/grub/i386-pc/pxe.mod  | Bin 0 -> 3824 bytes
 .../grub/data/etc/grub/i386-pc/pxechain.mod        | Bin 0 -> 2668 bytes
 .../grub/data/etc/grub/i386-pc/raid5rec.mod        | Bin 0 -> 1404 bytes
 .../grub/data/etc/grub/i386-pc/raid6rec.mod        | Bin 0 -> 2188 bytes
 remote/modules/grub/data/etc/grub/i386-pc/read.mod | Bin 0 -> 1448 bytes
 .../modules/grub/data/etc/grub/i386-pc/reboot.mod  | Bin 0 -> 1716 bytes
 .../modules/grub/data/etc/grub/i386-pc/regexp.mod  | Bin 0 -> 51176 bytes
 .../grub/data/etc/grub/i386-pc/reiserfs.mod        | Bin 0 -> 8944 bytes
 .../grub/data/etc/grub/i386-pc/relocator.mod       | Bin 0 -> 14936 bytes
 .../modules/grub/data/etc/grub/i386-pc/romfs.mod   | Bin 0 -> 4196 bytes
 remote/modules/grub/data/etc/grub/i386-pc/scsi.mod | Bin 0 -> 4972 bytes
 .../modules/grub/data/etc/grub/i386-pc/search.mod  | Bin 0 -> 3664 bytes
 .../grub/data/etc/grub/i386-pc/search_fs_file.mod  | Bin 0 -> 3236 bytes
 .../grub/data/etc/grub/i386-pc/search_fs_uuid.mod  | Bin 0 -> 3196 bytes
 .../grub/data/etc/grub/i386-pc/search_label.mod    | Bin 0 -> 3140 bytes
 .../modules/grub/data/etc/grub/i386-pc/sendkey.mod | Bin 0 -> 7080 bytes
 .../modules/grub/data/etc/grub/i386-pc/serial.mod  | Bin 0 -> 7756 bytes
 .../modules/grub/data/etc/grub/i386-pc/setjmp.mod  | Bin 0 -> 706 bytes
 .../grub/data/etc/grub/i386-pc/setjmp_test.mod     | Bin 0 -> 1700 bytes
 .../modules/grub/data/etc/grub/i386-pc/setpci.mod  | Bin 0 -> 5388 bytes
 remote/modules/grub/data/etc/grub/i386-pc/sfs.mod  | Bin 0 -> 5144 bytes
 .../grub/data/etc/grub/i386-pc/signature_test.mod  | Bin 0 -> 6408 bytes
 .../modules/grub/data/etc/grub/i386-pc/sleep.mod   | Bin 0 -> 2272 bytes
 .../grub/data/etc/grub/i386-pc/sleep_test.mod      | Bin 0 -> 2316 bytes
 .../grub/data/etc/grub/i386-pc/spkmodem.mod        | Bin 0 -> 2080 bytes
 .../modules/grub/data/etc/grub/i386-pc/squash4.mod | Bin 0 -> 6872 bytes
 .../grub/data/etc/grub/i386-pc/syslinuxcfg.mod     | Bin 0 -> 17460 bytes
 remote/modules/grub/data/etc/grub/i386-pc/tar.mod  | Bin 0 -> 3348 bytes
 .../grub/data/etc/grub/i386-pc/terminal.lst        |  11 +
 .../grub/data/etc/grub/i386-pc/terminal.mod        | Bin 0 -> 4464 bytes
 .../grub/data/etc/grub/i386-pc/terminfo.mod        | Bin 0 -> 11636 bytes
 remote/modules/grub/data/etc/grub/i386-pc/test.mod | Bin 0 -> 5128 bytes
 .../grub/data/etc/grub/i386-pc/test_blockarg.mod   | Bin 0 -> 1340 bytes
 .../grub/data/etc/grub/i386-pc/testload.mod        | Bin 0 -> 2712 bytes
 .../grub/data/etc/grub/i386-pc/testspeed.mod       | Bin 0 -> 2308 bytes
 remote/modules/grub/data/etc/grub/i386-pc/tftp.mod | Bin 0 -> 5288 bytes
 remote/modules/grub/data/etc/grub/i386-pc/tga.mod  | Bin 0 -> 4448 bytes
 remote/modules/grub/data/etc/grub/i386-pc/time.mod | Bin 0 -> 1508 bytes
 remote/modules/grub/data/etc/grub/i386-pc/tr.mod   | Bin 0 -> 2388 bytes
 remote/modules/grub/data/etc/grub/i386-pc/trig.mod | Bin 0 -> 1755 bytes
 remote/modules/grub/data/etc/grub/i386-pc/true.mod | Bin 0 -> 1204 bytes
 .../grub/data/etc/grub/i386-pc/truecrypt.mod       | Bin 0 -> 3544 bytes
 remote/modules/grub/data/etc/grub/i386-pc/udf.mod  | Bin 0 -> 7776 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ufs1.mod | Bin 0 -> 5476 bytes
 .../modules/grub/data/etc/grub/i386-pc/ufs1_be.mod | Bin 0 -> 5932 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ufs2.mod | Bin 0 -> 5536 bytes
 remote/modules/grub/data/etc/grub/i386-pc/uhci.mod | Bin 0 -> 6668 bytes
 remote/modules/grub/data/etc/grub/i386-pc/usb.mod  | Bin 0 -> 10716 bytes
 .../grub/data/etc/grub/i386-pc/usb_keyboard.mod    | Bin 0 -> 3924 bytes
 .../modules/grub/data/etc/grub/i386-pc/usbms.mod   | Bin 0 -> 7064 bytes
 .../data/etc/grub/i386-pc/usbserial_common.mod     | Bin 0 -> 2064 bytes
 .../grub/data/etc/grub/i386-pc/usbserial_ftdi.mod  | Bin 0 -> 2348 bytes
 .../data/etc/grub/i386-pc/usbserial_pl2303.mod     | Bin 0 -> 2692 bytes
 .../data/etc/grub/i386-pc/usbserial_usbdebug.mod   | Bin 0 -> 1536 bytes
 .../modules/grub/data/etc/grub/i386-pc/usbtest.mod | Bin 0 -> 3608 bytes
 remote/modules/grub/data/etc/grub/i386-pc/vbe.mod  | Bin 0 -> 9900 bytes
 .../modules/grub/data/etc/grub/i386-pc/verify.mod  | Bin 0 -> 11664 bytes
 remote/modules/grub/data/etc/grub/i386-pc/vga.mod  | Bin 0 -> 5028 bytes
 .../grub/data/etc/grub/i386-pc/vga_text.mod        | Bin 0 -> 2148 bytes
 .../modules/grub/data/etc/grub/i386-pc/video.lst   |   4 +
 .../modules/grub/data/etc/grub/i386-pc/video.mod   | Bin 0 -> 6176 bytes
 .../grub/data/etc/grub/i386-pc/video_bochs.mod     | Bin 0 -> 5700 bytes
 .../grub/data/etc/grub/i386-pc/video_cirrus.mod    | Bin 0 -> 6048 bytes
 .../grub/data/etc/grub/i386-pc/video_colors.mod    | Bin 0 -> 5684 bytes
 .../grub/data/etc/grub/i386-pc/video_fb.mod        | Bin 0 -> 23372 bytes
 .../grub/data/etc/grub/i386-pc/videoinfo.mod       | Bin 0 -> 3972 bytes
 .../grub/data/etc/grub/i386-pc/videotest.mod       | Bin 0 -> 4248 bytes
 .../data/etc/grub/i386-pc/videotest_checksum.mod   | Bin 0 -> 2396 bytes
 remote/modules/grub/data/etc/grub/i386-pc/xfs.mod  | Bin 0 -> 6168 bytes
 remote/modules/grub/data/etc/grub/i386-pc/xnu.mod  | Bin 0 -> 27336 bytes
 .../grub/data/etc/grub/i386-pc/xnu_uuid.mod        | Bin 0 -> 2144 bytes
 .../grub/data/etc/grub/i386-pc/xnu_uuid_test.mod   | Bin 0 -> 2012 bytes
 remote/modules/grub/data/etc/grub/i386-pc/xzio.mod | Bin 0 -> 15840 bytes
 remote/modules/grub/data/etc/grub/i386-pc/zfs.mod  | Bin 0 -> 39472 bytes
 .../grub/data/etc/grub/i386-pc/zfscrypt.mod        | Bin 0 -> 5472 bytes
 .../modules/grub/data/etc/grub/i386-pc/zfsinfo.mod | Bin 0 -> 6600 bytes
 remote/modules/grub/data/etc/grub/locale/en_AU.mo  | Bin 0 -> 942 bytes
 remote/modules/grub/data/etc/grub/locale/en_CA.mo  | Bin 0 -> 466 bytes
 remote/modules/grub/data/etc/grub/locale/en_GB.mo  | Bin 0 -> 4377 bytes
 remote/modules/grub/data/etc/grub/locale/pt.mo     | Bin 0 -> 33421 bytes
 remote/modules/grub/data/etc/grub/locale/pt_BR.mo  | Bin 0 -> 101546 bytes
 remote/modules/grub/data/etc/grub/unicode.pf2      | Bin 0 -> 2405285 bytes
 remote/modules/grub/grub                           |   1 +
 remote/modules/grub/module.build                   |  18 ++
 remote/modules/grub/module.conf                    |   9 +
 remote/modules/grub/module.conf.ubuntu             |   7 +
 remote/rootfs/rootfs-stage31/data/inc/functions    |  16 ++
 remote/rootfs/rootfs-stage31/data/inc/parse_kcl    |   4 +
 remote/rootfs/rootfs-stage31/data/init             |   7 +
 remote/rootfs/rootfs-stage32/module.conf           |   1 +
 remote/targets/stage32-curitiba/grub               |   1 +
 server/configs/curitiba/hdd-boot                   |   1 +
 .../hdd-boot/etc/systemd/system/hdd_boot.service   |  11 +
 .../multi-user.target.wants/hdd_boot.service       |   1 +
 .../hdd-boot/opt/openslx/scripts/systemd-hdd_boot  | 122 ++++++++++
 294 files changed, 1041 insertions(+)
 create mode 100644 remote/modules/grub/data/etc/grub/gfxblacklist.txt
 create mode 100644 remote/modules/grub/data/etc/grub/grub.cfg
 create mode 100644 remote/modules/grub/data/etc/grub/grub.default.style
 create mode 100644 remote/modules/grub/data/etc/grub/grubenv
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/915resolution.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/acpi.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/adler32.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/affs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/afs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ahci.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/all_video.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/aout.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/archelp.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/at_keyboard.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ata.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/backtrace.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/bfs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/biosdisk.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/bitmap.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/bitmap_scale.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/blocklist.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/boot.img
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/boot.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/bsd.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/btrfs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/bufio.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cat.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cbfs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cbls.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cbmemc.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cbtable.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cbtime.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/chain.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cmdline_cat_test.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cmosdump.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cmostest.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cmp.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/command.lst
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/configfile.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/core.img
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cpio.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cpio_be.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cpuid.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/crc64.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/crypto.lst
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/crypto.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cryptodisk.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cs5536.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/date.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/datehook.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/datetime.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/disk.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/diskfilter.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/div_test.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/dm_nv.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/drivemap.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/echo.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/efiemu.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/efiemu32.o
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/efiemu64.o
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ehci.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/elf.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/eval.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/exfat.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/exfctest.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ext2.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/extcmd.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/fat.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/file.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/font.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/freedos.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/fs.lst
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/fshelp.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/functional_test.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_arcfour.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_blowfish.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_camellia.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_cast5.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_crc.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_des.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_dsa.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_idea.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_md4.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_md5.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_rfc2268.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_rijndael.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_rmd160.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_rsa.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_seed.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_serpent.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_sha1.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_sha256.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_sha512.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_tiger.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_twofish.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_whirlpool.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gdb.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/geli.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gettext.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gfxmenu.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gfxterm.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gfxterm_background.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gfxterm_menu.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gptsync.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gzio.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/halt.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hashsum.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hdparm.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hello.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/help.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hexdump.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hfs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hfsplus.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hfspluscomp.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/http.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hwmatch.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/iorw.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/iso9660.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/jfs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/jpeg.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/keylayouts.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/keystatus.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ldm.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/legacy_password_test.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/legacycfg.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/linux.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/linux16.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/loadenv.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/loopback.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ls.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/lsacpi.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/lsapm.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/lsmmap.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/lspci.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/luks.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/lvm.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/lzopio.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/macbless.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/macho.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/mda_text.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/mdraid09.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/mdraid09_be.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/mdraid1x.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/memdisk.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/memrw.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/minicmd.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/minix.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/minix2.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/minix2_be.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/minix3.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/minix3_be.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/minix_be.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/mmap.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/moddep.lst
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/modinfo.sh
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/morse.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/mpi.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/msdospart.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/multiboot.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/multiboot2.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/nativedisk.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/net.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/newc.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/nilfs2.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/normal.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ntfs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ntfscomp.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ntldr.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/odc.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/offsetio.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ohci.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_acorn.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_amiga.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_apple.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_bsd.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_dfly.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_dvh.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_gpt.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_msdos.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_plan.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_sun.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_sunpc.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/partmap.lst
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/parttool.lst
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/parttool.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/password.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/password_pbkdf2.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/pata.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/pbkdf2.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/pbkdf2_test.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/pci.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/pcidump.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/plan9.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/play.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/png.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/priority_queue.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/probe.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/procfs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/progress.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/pxe.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/pxechain.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/raid5rec.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/raid6rec.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/read.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/reboot.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/regexp.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/reiserfs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/relocator.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/romfs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/scsi.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/search.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/search_fs_file.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/search_fs_uuid.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/search_label.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/sendkey.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/serial.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/setjmp.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/setjmp_test.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/setpci.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/sfs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/signature_test.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/sleep.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/sleep_test.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/spkmodem.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/squash4.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/syslinuxcfg.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/tar.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/terminal.lst
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/terminal.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/terminfo.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/test.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/test_blockarg.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/testload.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/testspeed.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/tftp.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/tga.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/time.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/tr.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/trig.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/true.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/truecrypt.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/udf.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ufs1.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ufs1_be.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ufs2.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/uhci.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usb.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usb_keyboard.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usbms.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usbserial_common.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usbserial_ftdi.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usbserial_pl2303.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usbserial_usbdebug.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usbtest.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/vbe.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/verify.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/vga.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/vga_text.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/video.lst
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/video.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/video_bochs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/video_cirrus.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/video_colors.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/video_fb.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/videoinfo.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/videotest.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/videotest_checksum.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/xfs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/xnu.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid_test.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/xzio.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/zfs.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/zfscrypt.mod
 create mode 100644 remote/modules/grub/data/etc/grub/i386-pc/zfsinfo.mod
 create mode 100644 remote/modules/grub/data/etc/grub/locale/en_AU.mo
 create mode 100644 remote/modules/grub/data/etc/grub/locale/en_CA.mo
 create mode 100644 remote/modules/grub/data/etc/grub/locale/en_GB.mo
 create mode 100644 remote/modules/grub/data/etc/grub/locale/pt.mo
 create mode 100644 remote/modules/grub/data/etc/grub/locale/pt_BR.mo
 create mode 100644 remote/modules/grub/data/etc/grub/unicode.pf2
 create mode 120000 remote/modules/grub/grub
 create mode 100644 remote/modules/grub/module.build
 create mode 100644 remote/modules/grub/module.conf
 create mode 100644 remote/modules/grub/module.conf.ubuntu
 create mode 120000 remote/targets/stage32-curitiba/grub
 create mode 120000 server/configs/curitiba/hdd-boot
 create mode 100644 server/modules/hdd-boot/etc/systemd/system/hdd_boot.service
 create mode 120000 server/modules/hdd-boot/etc/systemd/system/multi-user.target.wants/hdd_boot.service
 create mode 100755 server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot

(limited to 'server/modules')

diff --git a/remote/modules/grub/data/etc/grub/gfxblacklist.txt b/remote/modules/grub/data/etc/grub/gfxblacklist.txt
new file mode 100644
index 00000000..9e91caa9
--- /dev/null
+++ b/remote/modules/grub/data/etc/grub/gfxblacklist.txt
@@ -0,0 +1,19 @@
+# GRUB gfxpayload blacklist.  The format is a sequence of lines of the
+# following form, using lower-case hexadecimal for all ID components:
+#
+#   vVENDORdDEVICEsvSUBVENDORsdSUBDEVICEbcBASECLASSscSUBCLASS
+#
+# Blacklist lines are regex-matched (currently using Lua's string.find with
+# the line surrounded by ^ and $) against a corresponding PCI ID string.  In
+# practice this means that you can replace any part of the ID string with .*
+# to match anything.
+#
+# There is no need to customise this file locally.  If you need to disable
+# gfxpayload=keep on your system, just add this line (uncommented) to
+# /etc/default/grub:
+#
+#   GRUB_GFXPAYLOAD_LINUX=text
+
+v15add0710.*
+v15add0405.*
+v1002d6738.*
diff --git a/remote/modules/grub/data/etc/grub/grub.cfg b/remote/modules/grub/data/etc/grub/grub.cfg
new file mode 100644
index 00000000..7654d3b2
--- /dev/null
+++ b/remote/modules/grub/data/etc/grub/grub.cfg
@@ -0,0 +1,192 @@
+#
+# DO NOT EDIT THIS FILE
+#
+# It is automatically generated by grub-mkconfig using templates
+# from /etc/grub.d and settings from /etc/default/grub
+#
+
+### BEGIN /etc/grub.d/00_header ###
+if [ -s $prefix/grubenv ]; then
+  set have_grubenv=true
+  load_env
+fi
+if [ "${next_entry}" ] ; then
+   set default="${next_entry}"
+   set next_entry=
+   save_env next_entry
+   set boot_once=true
+else
+   set default="0"
+fi
+
+if [ x"${feature_menuentry_id}" = xy ]; then
+  menuentry_id_option="--id"
+else
+  menuentry_id_option=""
+fi
+
+export menuentry_id_option
+
+if [ "${prev_saved_entry}" ]; then
+  set saved_entry="${prev_saved_entry}"
+  save_env saved_entry
+  set prev_saved_entry=
+  save_env prev_saved_entry
+  set boot_once=true
+fi
+
+function savedefault {
+  if [ -z "${boot_once}" ]; then
+    saved_entry="${chosen}"
+    save_env saved_entry
+  fi
+}
+function recordfail {
+  set recordfail=1
+  if [ -n "${have_grubenv}" ]; then if [ -z "${boot_once}" ]; then save_env recordfail; fi; fi
+}
+function load_video {
+  if [ x$feature_all_video_module = xy ]; then
+    insmod all_video
+  else
+    insmod efi_gop
+    insmod efi_uga
+    insmod ieee1275_fb
+    insmod vbe
+    insmod vga
+    insmod video_bochs
+    insmod video_cirrus
+  fi
+}
+
+if [ x$feature_default_font_path = xy ] ; then
+   font=unicode
+else
+insmod part_msdos
+insmod lvm
+insmod ext2
+set root='lvmid/ZvOK2H-W5xA-QoO2-zy2n-Sjr7-cpu8-M3zL6F/FzLrNP-IhMk-pB8d-vEEW-Jxxk-ujc7-NWSegg'
+if [ x$feature_platform_search_hint = xy ]; then
+  search --no-floppy --fs-uuid --set=root --hint='lvmid/ZvOK2H-W5xA-QoO2-zy2n-Sjr7-cpu8-M3zL6F/FzLrNP-IhMk-pB8d-vEEW-Jxxk-ujc7-NWSegg'  0bec626d-2d44-417d-acfd-83acbbcf2b34
+else
+  search --no-floppy --fs-uuid --set=root 0bec626d-2d44-417d-acfd-83acbbcf2b34
+fi
+    font="/usr/share/grub/unicode.pf2"
+fi
+
+if loadfont $font ; then
+  set gfxmode=auto
+  load_video
+  insmod gfxterm
+  set locale_dir=$prefix/locale
+  set lang=pt_PT
+  insmod gettext
+fi
+terminal_output gfxterm
+if [ "${recordfail}" = 1 ] ; then
+  set timeout=-1
+else
+  if [ x$feature_timeout_style = xy ] ; then
+    set timeout_style=menu
+    set timeout=10
+  # Fallback normal timeout code in case the timeout_style feature is
+  # unavailable.
+  else
+    set timeout=10
+  fi
+fi
+### END /etc/grub.d/00_header ###
+
+### BEGIN /etc/grub.d/05_debian_theme ###
+set menu_color_normal=white/black
+set menu_color_highlight=black/light-gray
+### END /etc/grub.d/05_debian_theme ###
+
+### BEGIN /etc/grub.d/06_mint_theme ###
+set menu_color_normal=white/black
+set menu_color_highlight=white/light-gray
+### END /etc/grub.d/06_mint_theme ###
+
+### BEGIN /etc/grub.d/10_linux ###
+function gfxmode {
+	set gfxpayload="$1"
+	if [ "$1" = "keep" ]; then
+		set vt_handoff=vt.handoff=7
+	else
+		set vt_handoff=
+	fi
+}
+if [ ${recordfail} != 1 ]; then
+  if [ -e ${prefix}/gfxblacklist.txt ]; then
+    if hwmatch ${prefix}/gfxblacklist.txt 3; then
+      if [ ${match} = 0 ]; then
+        set linux_gfx_mode=keep
+      else
+        set linux_gfx_mode=text
+      fi
+    else
+      set linux_gfx_mode=text
+    fi
+  else
+    set linux_gfx_mode=keep
+  fi
+else
+  set linux_gfx_mode=text
+fi
+export linux_gfx_mode
+if [ "$linux_gfx_mode" != "text" ]; then load_video; fi
+menuentry 'Linux Mint 17 Xfce 64-bit, 3.13.0-24-generic (/dev/mapper/sa_sabayon-root)' --class ubuntu --class gnu-linux --class gnu --class os {
+	recordfail
+	gfxmode $linux_gfx_mode
+	insmod gzio
+	insmod part_msdos
+	insmod lvm
+	insmod ext2
+	set root='lvmid/ZvOK2H-W5xA-QoO2-zy2n-Sjr7-cpu8-M3zL6F/FzLrNP-IhMk-pB8d-vEEW-Jxxk-ujc7-NWSegg'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='lvmid/ZvOK2H-W5xA-QoO2-zy2n-Sjr7-cpu8-M3zL6F/FzLrNP-IhMk-pB8d-vEEW-Jxxk-ujc7-NWSegg'  0bec626d-2d44-417d-acfd-83acbbcf2b34
+	else
+	  search --no-floppy --fs-uuid --set=root 0bec626d-2d44-417d-acfd-83acbbcf2b34
+	fi
+	linux	/boot/vmlinuz-3.13.0-24-generic root=/dev/mapper/sa_sabayon-root ro   quiet splash $vt_handoff
+	initrd	/boot/initrd.img-3.13.0-24-generic
+}
+### END /etc/grub.d/10_linux ###
+
+### BEGIN /etc/grub.d/10_lupin ###
+### END /etc/grub.d/10_lupin ###
+
+### BEGIN /etc/grub.d/20_linux_xen ###
+
+### END /etc/grub.d/20_linux_xen ###
+
+### BEGIN /etc/grub.d/20_memtest86+ ###
+menuentry 'Ubuntu_1404_x64_tiago' {
+	linux (hd0,msdos2)/kernel/kernel slxsrv=200.17.202.46 slxbase=ubuntu_1404_x64_tiago quiet splash vga=current
+	initrd (hd0,msdos2)/initramfs-stage31
+}
+### END /etc/grub.d/20_memtest86+ ###
+
+### BEGIN /etc/grub.d/30_os-prober ###
+set timeout_style=menu
+if [ "${timeout}" = 0 ]; then
+  set timeout=10
+fi
+### END /etc/grub.d/30_os-prober ###
+
+### BEGIN /etc/grub.d/30_uefi-firmware ###
+### END /etc/grub.d/30_uefi-firmware ###
+
+### BEGIN /etc/grub.d/40_custom ###
+# This file provides an easy way to add custom menu entries.  Simply type the
+# menu entries you want to add after this comment.  Be careful not to change
+# the 'exec tail' line above.
+### END /etc/grub.d/40_custom ###
+
+### BEGIN /etc/grub.d/41_custom ###
+if [ -f  ${config_directory}/custom.cfg ]; then
+  source ${config_directory}/custom.cfg
+elif [ -z "${config_directory}" -a -f  $prefix/custom.cfg ]; then
+  source $prefix/custom.cfg;
+fi
+### END /etc/grub.d/41_custom ###
diff --git a/remote/modules/grub/data/etc/grub/grub.default.style b/remote/modules/grub/data/etc/grub/grub.default.style
new file mode 100644
index 00000000..af835d3b
--- /dev/null
+++ b/remote/modules/grub/data/etc/grub/grub.default.style
@@ -0,0 +1,27 @@
+#
+# DO NOT EDIT THIS FILE
+#
+# It is automatically generated by grub-mkconfig using templates
+# from /etc/grub.d and settings from /etc/default/grub
+#
+
+### BEGIN /etc/grub.d/00_header ###
+    set gfxmode=auto
+    load_video
+    insmod gfxterm
+    set lang=pt_PT
+    set timeout_style=menu
+    set timeout=10
+### END /etc/grub.d/00_header ###
+
+### BEGIN /etc/grub.d/05_debian_theme ###
+#set menu_color_normal=white/black
+#set menu_color_highlight=black/light-gray
+### END /etc/grub.d/05_debian_theme ###
+
+### BEGIN /etc/grub.d/06_mint_theme ###
+set menu_color_normal=white/black
+set menu_color_highlight=white/light-gray
+### END /etc/grub.d/06_mint_theme ###
+
+
diff --git a/remote/modules/grub/data/etc/grub/grubenv b/remote/modules/grub/data/etc/grub/grubenv
new file mode 100644
index 00000000..f93ccbff
--- /dev/null
+++ b/remote/modules/grub/data/etc/grub/grubenv
@@ -0,0 +1,2 @@
+# GRUB Environment Block
+#######################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################
\ No newline at end of file
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/915resolution.mod b/remote/modules/grub/data/etc/grub/i386-pc/915resolution.mod
new file mode 100644
index 00000000..e0838914
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/915resolution.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/acpi.mod b/remote/modules/grub/data/etc/grub/i386-pc/acpi.mod
new file mode 100644
index 00000000..90ee529d
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/acpi.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/adler32.mod b/remote/modules/grub/data/etc/grub/i386-pc/adler32.mod
new file mode 100644
index 00000000..860624b3
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/adler32.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/affs.mod b/remote/modules/grub/data/etc/grub/i386-pc/affs.mod
new file mode 100644
index 00000000..7c4938de
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/affs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/afs.mod b/remote/modules/grub/data/etc/grub/i386-pc/afs.mod
new file mode 100644
index 00000000..ef97926f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/afs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ahci.mod b/remote/modules/grub/data/etc/grub/i386-pc/ahci.mod
new file mode 100644
index 00000000..7a38c4fe
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/ahci.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/all_video.mod b/remote/modules/grub/data/etc/grub/i386-pc/all_video.mod
new file mode 100644
index 00000000..ac321be6
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/all_video.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/aout.mod b/remote/modules/grub/data/etc/grub/i386-pc/aout.mod
new file mode 100644
index 00000000..40b64b64
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/aout.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/archelp.mod b/remote/modules/grub/data/etc/grub/i386-pc/archelp.mod
new file mode 100644
index 00000000..0b096945
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/archelp.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/at_keyboard.mod b/remote/modules/grub/data/etc/grub/i386-pc/at_keyboard.mod
new file mode 100644
index 00000000..83b558b3
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/at_keyboard.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ata.mod b/remote/modules/grub/data/etc/grub/i386-pc/ata.mod
new file mode 100644
index 00000000..1434a004
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/ata.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/backtrace.mod b/remote/modules/grub/data/etc/grub/i386-pc/backtrace.mod
new file mode 100644
index 00000000..2827ee69
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/backtrace.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/bfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/bfs.mod
new file mode 100644
index 00000000..062ada72
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/bfs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/biosdisk.mod b/remote/modules/grub/data/etc/grub/i386-pc/biosdisk.mod
new file mode 100644
index 00000000..9e9104d2
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/biosdisk.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/bitmap.mod b/remote/modules/grub/data/etc/grub/i386-pc/bitmap.mod
new file mode 100644
index 00000000..ad777331
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/bitmap.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/bitmap_scale.mod b/remote/modules/grub/data/etc/grub/i386-pc/bitmap_scale.mod
new file mode 100644
index 00000000..d6055683
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/bitmap_scale.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/blocklist.mod b/remote/modules/grub/data/etc/grub/i386-pc/blocklist.mod
new file mode 100644
index 00000000..37d39a21
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/blocklist.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/boot.img b/remote/modules/grub/data/etc/grub/i386-pc/boot.img
new file mode 100644
index 00000000..81a7a30a
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/boot.img differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/boot.mod b/remote/modules/grub/data/etc/grub/i386-pc/boot.mod
new file mode 100644
index 00000000..5a0ae46c
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/boot.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/bsd.mod b/remote/modules/grub/data/etc/grub/i386-pc/bsd.mod
new file mode 100644
index 00000000..6254c08d
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/bsd.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/btrfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/btrfs.mod
new file mode 100644
index 00000000..d058eadd
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/btrfs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/bufio.mod b/remote/modules/grub/data/etc/grub/i386-pc/bufio.mod
new file mode 100644
index 00000000..c14030a9
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/bufio.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cat.mod b/remote/modules/grub/data/etc/grub/i386-pc/cat.mod
new file mode 100644
index 00000000..70e13273
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cat.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cbfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/cbfs.mod
new file mode 100644
index 00000000..2fee8756
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cbfs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cbls.mod b/remote/modules/grub/data/etc/grub/i386-pc/cbls.mod
new file mode 100644
index 00000000..8885a529
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cbls.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cbmemc.mod b/remote/modules/grub/data/etc/grub/i386-pc/cbmemc.mod
new file mode 100644
index 00000000..a9070914
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cbmemc.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cbtable.mod b/remote/modules/grub/data/etc/grub/i386-pc/cbtable.mod
new file mode 100644
index 00000000..a97728b4
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cbtable.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cbtime.mod b/remote/modules/grub/data/etc/grub/i386-pc/cbtime.mod
new file mode 100644
index 00000000..58d2c8b9
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cbtime.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/chain.mod b/remote/modules/grub/data/etc/grub/i386-pc/chain.mod
new file mode 100644
index 00000000..047f4521
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/chain.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cmdline_cat_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/cmdline_cat_test.mod
new file mode 100644
index 00000000..127cd36a
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cmdline_cat_test.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cmosdump.mod b/remote/modules/grub/data/etc/grub/i386-pc/cmosdump.mod
new file mode 100644
index 00000000..914c5709
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cmosdump.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cmostest.mod b/remote/modules/grub/data/etc/grub/i386-pc/cmostest.mod
new file mode 100644
index 00000000..9051d318
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cmostest.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cmp.mod b/remote/modules/grub/data/etc/grub/i386-pc/cmp.mod
new file mode 100644
index 00000000..18a86034
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cmp.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/command.lst b/remote/modules/grub/data/etc/grub/i386-pc/command.lst
new file mode 100644
index 00000000..d3d74ed4
--- /dev/null
+++ b/remote/modules/grub/data/etc/grub/i386-pc/command.lst
@@ -0,0 +1,199 @@
+*acpi: acpi
+*all_functional_test: functional_test
+*background_image: gfxterm_background
+*cat: cat
+*cpuid: cpuid
+*crc: hashsum
+*cryptomount: cryptodisk
+*drivemap: drivemap
+*echo: echo
+*extract_syslinux_entries_configfile: syslinuxcfg
+*extract_syslinux_entries_source: syslinuxcfg
+*file: file
+*functional_test: functional_test
+*gettext: gettext
+*halt: halt
+*hashsum: hashsum
+*hdparm: hdparm
+*hello: hello
+*help: help
+*hexdump: hexdump
+*inb: iorw
+*inl: iorw
+*inw: iorw
+*keystatus: keystatus
+*kfreebsd: bsd
+*knetbsd: bsd
+*kopenbsd: bsd
+*list_env: loadenv
+*load_env: loadenv
+*loopback: loopback
+*ls: ls
+*lsacpi: lsacpi
+*lspci: lspci
+*md5sum: hashsum
+*menuentry: normal
+*pcidump: pcidump
+*plan9: plan9
+*probe: probe
+*read_byte: memrw
+*read_dword: memrw
+*read_word: memrw
+*regexp: regexp
+*save_env: loadenv
+*search: search
+*sendkey: sendkey
+*serial: serial
+*setpci: setpci
+*sha1sum: hashsum
+*sha256sum: hashsum
+*sha512sum: hashsum
+*sleep: sleep
+*submenu: normal
+*syslinux_configfile: syslinuxcfg
+*syslinux_source: syslinuxcfg
+*terminfo: terminfo
+*test_blockarg: test_blockarg
+*testspeed: testspeed
+*tr: tr
+*trust: verify
+*verify_detached: verify
+*xnu_splash: xnu
+*zfskey: zfscrypt
+.: configfile
+915resolution: 915resolution
+[: test
+authenticate: normal
+background_color: gfxterm_background
+backtrace: backtrace
+badram: mmap
+blocklist: blocklist
+boot: boot
+break: normal
+cat: minicmd
+cbmemc: cbmemc
+chainloader: chain
+clear: normal
+cmosclean: cmostest
+cmosdump: cmosdump
+cmosset: cmostest
+cmostest: cmostest
+cmp: cmp
+configfile: configfile
+continue: normal
+coreboot_boottime: cbtime
+cutmem: mmap
+date: date
+distrust: verify
+dump: minicmd
+efiemu_loadcore: efiemu
+efiemu_prepare: efiemu
+efiemu_unload: efiemu
+eval: eval
+exit: minicmd
+export: normal
+extract_entries_configfile: configfile
+extract_entries_source: configfile
+extract_legacy_entries_configfile: legacycfg
+extract_legacy_entries_source: legacycfg
+false: true
+freedos: freedos
+gdbstub: gdb
+gdbstub_break: gdb
+gdbstub_stop: gdb
+gptsync: gptsync
+help: minicmd
+hwmatch: hwmatch
+initrd16: linux16
+initrd: linux
+keymap: keylayouts
+kfreebsd_loadenv: bsd
+kfreebsd_module: bsd
+kfreebsd_module_elf: bsd
+knetbsd_module: bsd
+knetbsd_module_elf: bsd
+kopenbsd_ramdisk: bsd
+legacy_check_password: legacycfg
+legacy_configfile: legacycfg
+legacy_initrd: legacycfg
+legacy_initrd_nounzip: legacycfg
+legacy_kernel: legacycfg
+legacy_password: legacycfg
+legacy_source: legacycfg
+linux16: linux16
+linux: linux
+list_trusted: verify
+loadfont: font
+lsapm: lsapm
+lscoreboot: cbls
+lsfonts: font
+lsmmap: lsmmap
+lsmod: minicmd
+macppcbless: macbless
+mactelbless: macbless
+module2: multiboot2
+module: multiboot
+multiboot2: multiboot2
+multiboot: multiboot
+nativedisk: nativedisk
+net_add_addr: net
+net_add_dns: net
+net_add_route: net
+net_bootp: net
+net_del_addr: net
+net_del_dns: net
+net_del_route: net
+net_get_dhcp_option: net
+net_ipv6_autoconf: net
+net_ls_addr: net
+net_ls_cards: net
+net_ls_dns: net
+net_ls_routes: net
+net_nslookup: net
+normal: normal
+normal_exit: normal
+ntldr: ntldr
+outb: iorw
+outl: iorw
+outw: iorw
+parttool: parttool
+password: password
+password_pbkdf2: password_pbkdf2
+play: play
+pxechainloader: pxechain
+read: read
+reboot: reboot
+return: normal
+rmmod: minicmd
+search.file: search_fs_file
+search.fs_label: search_label
+search.fs_uuid: search_fs_uuid
+setparams: normal
+shift: normal
+source: configfile
+terminal_input: terminal
+terminal_output: terminal
+test: test
+testload: testload
+time: time
+true: true
+truecrypt: truecrypt
+usb: usbtest
+vbeinfo: videoinfo
+vbetest: videotest
+videoinfo: videoinfo
+videotest: videotest
+write_byte: memrw
+write_dword: memrw
+write_word: memrw
+xnu_devprop_load: xnu
+xnu_kernel64: xnu
+xnu_kernel: xnu
+xnu_kext: xnu
+xnu_kextdir: xnu
+xnu_mkext: xnu
+xnu_ramdisk: xnu
+xnu_resume: xnu
+xnu_uuid: xnu_uuid
+zfs-bootfs: zfsinfo
+zfsinfo: zfsinfo
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/configfile.mod b/remote/modules/grub/data/etc/grub/i386-pc/configfile.mod
new file mode 100644
index 00000000..b46c328e
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/configfile.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/core.img b/remote/modules/grub/data/etc/grub/i386-pc/core.img
new file mode 100644
index 00000000..d84d8779
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/core.img differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cpio.mod b/remote/modules/grub/data/etc/grub/i386-pc/cpio.mod
new file mode 100644
index 00000000..284643da
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cpio.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cpio_be.mod b/remote/modules/grub/data/etc/grub/i386-pc/cpio_be.mod
new file mode 100644
index 00000000..14becb0b
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cpio_be.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cpuid.mod b/remote/modules/grub/data/etc/grub/i386-pc/cpuid.mod
new file mode 100644
index 00000000..156b5d21
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cpuid.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/crc64.mod b/remote/modules/grub/data/etc/grub/i386-pc/crc64.mod
new file mode 100644
index 00000000..9126be99
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/crc64.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/crypto.lst b/remote/modules/grub/data/etc/grub/i386-pc/crypto.lst
new file mode 100644
index 00000000..77d9efc0
--- /dev/null
+++ b/remote/modules/grub/data/etc/grub/i386-pc/crypto.lst
@@ -0,0 +1,45 @@
+RIJNDAEL: gcry_rijndael
+RIJNDAEL192: gcry_rijndael
+RIJNDAEL256: gcry_rijndael
+AES128: gcry_rijndael
+AES-128: gcry_rijndael
+AES-192: gcry_rijndael
+AES-256: gcry_rijndael
+ADLER32: adler32
+CRC64: crc64
+ARCFOUR: gcry_arcfour
+BLOWFISH: gcry_blowfish
+CAMELLIA128: gcry_camellia
+CAMELLIA192: gcry_camellia
+CAMELLIA256: gcry_camellia
+CAST5: gcry_cast5
+CRC32: gcry_crc
+CRC32RFC1510: gcry_crc
+CRC24RFC2440: gcry_crc
+DES: gcry_des
+3DES: gcry_des
+DSA: gcry_dsa
+IDEA: gcry_idea
+MD4: gcry_md4
+MD5: gcry_md5
+RFC2268_40: gcry_rfc2268
+AES: gcry_rijndael
+AES192: gcry_rijndael
+AES256: gcry_rijndael
+RIPEMD160: gcry_rmd160
+RSA: gcry_rsa
+SEED: gcry_seed
+SERPENT128: gcry_serpent
+SERPENT192: gcry_serpent
+SERPENT256: gcry_serpent
+SHA1: gcry_sha1
+SHA224: gcry_sha256
+SHA256: gcry_sha256
+SHA512: gcry_sha512
+SHA384: gcry_sha512
+TIGER192: gcry_tiger
+TIGER: gcry_tiger
+TIGER2: gcry_tiger
+TWOFISH: gcry_twofish
+TWOFISH128: gcry_twofish
+WHIRLPOOL: gcry_whirlpool
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/crypto.mod b/remote/modules/grub/data/etc/grub/i386-pc/crypto.mod
new file mode 100644
index 00000000..1ff552a4
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/crypto.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cryptodisk.mod b/remote/modules/grub/data/etc/grub/i386-pc/cryptodisk.mod
new file mode 100644
index 00000000..d5376a5b
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cryptodisk.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cs5536.mod b/remote/modules/grub/data/etc/grub/i386-pc/cs5536.mod
new file mode 100644
index 00000000..550b9d12
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/cs5536.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/date.mod b/remote/modules/grub/data/etc/grub/i386-pc/date.mod
new file mode 100644
index 00000000..e89dc1a2
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/date.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/datehook.mod b/remote/modules/grub/data/etc/grub/i386-pc/datehook.mod
new file mode 100644
index 00000000..8eb4280d
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/datehook.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/datetime.mod b/remote/modules/grub/data/etc/grub/i386-pc/datetime.mod
new file mode 100644
index 00000000..25a29615
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/datetime.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/disk.mod b/remote/modules/grub/data/etc/grub/i386-pc/disk.mod
new file mode 100644
index 00000000..f2aeada0
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/disk.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/diskfilter.mod b/remote/modules/grub/data/etc/grub/i386-pc/diskfilter.mod
new file mode 100644
index 00000000..f1a45a33
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/diskfilter.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/div_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/div_test.mod
new file mode 100644
index 00000000..65bc32b8
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/div_test.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/dm_nv.mod b/remote/modules/grub/data/etc/grub/i386-pc/dm_nv.mod
new file mode 100644
index 00000000..32c26036
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/dm_nv.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/drivemap.mod b/remote/modules/grub/data/etc/grub/i386-pc/drivemap.mod
new file mode 100644
index 00000000..5410ef88
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/drivemap.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/echo.mod b/remote/modules/grub/data/etc/grub/i386-pc/echo.mod
new file mode 100644
index 00000000..057586dd
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/echo.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/efiemu.mod b/remote/modules/grub/data/etc/grub/i386-pc/efiemu.mod
new file mode 100644
index 00000000..ab253550
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/efiemu.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/efiemu32.o b/remote/modules/grub/data/etc/grub/i386-pc/efiemu32.o
new file mode 100644
index 00000000..56fbedc9
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/efiemu32.o differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/efiemu64.o b/remote/modules/grub/data/etc/grub/i386-pc/efiemu64.o
new file mode 100644
index 00000000..f25fe93c
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/efiemu64.o differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ehci.mod b/remote/modules/grub/data/etc/grub/i386-pc/ehci.mod
new file mode 100644
index 00000000..4ff3a9b8
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/ehci.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/elf.mod b/remote/modules/grub/data/etc/grub/i386-pc/elf.mod
new file mode 100644
index 00000000..35467cfd
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/elf.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/eval.mod b/remote/modules/grub/data/etc/grub/i386-pc/eval.mod
new file mode 100644
index 00000000..4250f0cc
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/eval.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/exfat.mod b/remote/modules/grub/data/etc/grub/i386-pc/exfat.mod
new file mode 100644
index 00000000..287bba3b
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/exfat.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/exfctest.mod b/remote/modules/grub/data/etc/grub/i386-pc/exfctest.mod
new file mode 100644
index 00000000..2e2f3329
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/exfctest.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ext2.mod b/remote/modules/grub/data/etc/grub/i386-pc/ext2.mod
new file mode 100644
index 00000000..291d8407
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/ext2.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/extcmd.mod b/remote/modules/grub/data/etc/grub/i386-pc/extcmd.mod
new file mode 100644
index 00000000..477c32be
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/extcmd.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/fat.mod b/remote/modules/grub/data/etc/grub/i386-pc/fat.mod
new file mode 100644
index 00000000..fcac1440
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/fat.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/file.mod b/remote/modules/grub/data/etc/grub/i386-pc/file.mod
new file mode 100644
index 00000000..ec327c2e
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/file.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/font.mod b/remote/modules/grub/data/etc/grub/i386-pc/font.mod
new file mode 100644
index 00000000..4e3ec10e
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/font.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/freedos.mod b/remote/modules/grub/data/etc/grub/i386-pc/freedos.mod
new file mode 100644
index 00000000..d993f197
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/freedos.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/fs.lst b/remote/modules/grub/data/etc/grub/i386-pc/fs.lst
new file mode 100644
index 00000000..a069ccc6
--- /dev/null
+++ b/remote/modules/grub/data/etc/grub/i386-pc/fs.lst
@@ -0,0 +1,36 @@
+affs
+afs
+bfs
+btrfs
+cbfs
+cpio
+cpio_be
+exfat
+ext2
+fat
+hfs
+hfsplus
+iso9660
+jfs
+minix
+minix2
+minix2_be
+minix3
+minix3_be
+minix_be
+newc
+nilfs2
+ntfs
+odc
+procfs
+reiserfs
+romfs
+sfs
+squash4
+tar
+udf
+ufs1
+ufs1_be
+ufs2
+xfs
+zfs
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/fshelp.mod b/remote/modules/grub/data/etc/grub/i386-pc/fshelp.mod
new file mode 100644
index 00000000..148f0611
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/fshelp.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/functional_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/functional_test.mod
new file mode 100644
index 00000000..0e6c57ca
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/functional_test.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_arcfour.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_arcfour.mod
new file mode 100644
index 00000000..b73ad8e7
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_arcfour.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_blowfish.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_blowfish.mod
new file mode 100644
index 00000000..40aae3ee
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_blowfish.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_camellia.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_camellia.mod
new file mode 100644
index 00000000..ab407e2c
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_camellia.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_cast5.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_cast5.mod
new file mode 100644
index 00000000..5e9050b2
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_cast5.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_crc.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_crc.mod
new file mode 100644
index 00000000..399f55ea
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_crc.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_des.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_des.mod
new file mode 100644
index 00000000..3ea8d86e
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_des.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_dsa.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_dsa.mod
new file mode 100644
index 00000000..2096dd9f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_dsa.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_idea.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_idea.mod
new file mode 100644
index 00000000..a960ba8f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_idea.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_md4.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_md4.mod
new file mode 100644
index 00000000..95cacaf2
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_md4.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_md5.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_md5.mod
new file mode 100644
index 00000000..78920cd9
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_md5.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_rfc2268.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_rfc2268.mod
new file mode 100644
index 00000000..de23884f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_rfc2268.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_rijndael.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_rijndael.mod
new file mode 100644
index 00000000..36294845
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_rijndael.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_rmd160.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_rmd160.mod
new file mode 100644
index 00000000..60ad46af
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_rmd160.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_rsa.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_rsa.mod
new file mode 100644
index 00000000..0a6eb841
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_rsa.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_seed.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_seed.mod
new file mode 100644
index 00000000..a8bbe8d2
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_seed.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_serpent.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_serpent.mod
new file mode 100644
index 00000000..4a705f34
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_serpent.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha1.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha1.mod
new file mode 100644
index 00000000..d7d433a6
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha1.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha256.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha256.mod
new file mode 100644
index 00000000..4d80a978
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha256.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha512.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha512.mod
new file mode 100644
index 00000000..2899bde9
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha512.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_tiger.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_tiger.mod
new file mode 100644
index 00000000..0442ac26
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_tiger.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_twofish.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_twofish.mod
new file mode 100644
index 00000000..ada0491f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_twofish.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_whirlpool.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_whirlpool.mod
new file mode 100644
index 00000000..90d693ed
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gcry_whirlpool.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gdb.mod b/remote/modules/grub/data/etc/grub/i386-pc/gdb.mod
new file mode 100644
index 00000000..80e1c2ea
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gdb.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/geli.mod b/remote/modules/grub/data/etc/grub/i386-pc/geli.mod
new file mode 100644
index 00000000..4d84ca87
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/geli.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gettext.mod b/remote/modules/grub/data/etc/grub/i386-pc/gettext.mod
new file mode 100644
index 00000000..f14e11d9
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gettext.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gfxmenu.mod b/remote/modules/grub/data/etc/grub/i386-pc/gfxmenu.mod
new file mode 100644
index 00000000..ee520644
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gfxmenu.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gfxterm.mod b/remote/modules/grub/data/etc/grub/i386-pc/gfxterm.mod
new file mode 100644
index 00000000..48c96cf0
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gfxterm.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gfxterm_background.mod b/remote/modules/grub/data/etc/grub/i386-pc/gfxterm_background.mod
new file mode 100644
index 00000000..3d515a66
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gfxterm_background.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gfxterm_menu.mod b/remote/modules/grub/data/etc/grub/i386-pc/gfxterm_menu.mod
new file mode 100644
index 00000000..745af711
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gfxterm_menu.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gptsync.mod b/remote/modules/grub/data/etc/grub/i386-pc/gptsync.mod
new file mode 100644
index 00000000..24cc4fdd
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gptsync.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gzio.mod b/remote/modules/grub/data/etc/grub/i386-pc/gzio.mod
new file mode 100644
index 00000000..ade70438
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/gzio.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/halt.mod b/remote/modules/grub/data/etc/grub/i386-pc/halt.mod
new file mode 100644
index 00000000..454408a4
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/halt.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hashsum.mod b/remote/modules/grub/data/etc/grub/i386-pc/hashsum.mod
new file mode 100644
index 00000000..920dfa97
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/hashsum.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hdparm.mod b/remote/modules/grub/data/etc/grub/i386-pc/hdparm.mod
new file mode 100644
index 00000000..1e309ba1
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/hdparm.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hello.mod b/remote/modules/grub/data/etc/grub/i386-pc/hello.mod
new file mode 100644
index 00000000..993c5023
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/hello.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/help.mod b/remote/modules/grub/data/etc/grub/i386-pc/help.mod
new file mode 100644
index 00000000..bd9cd4b3
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/help.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hexdump.mod b/remote/modules/grub/data/etc/grub/i386-pc/hexdump.mod
new file mode 100644
index 00000000..22fdcdd1
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/hexdump.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/hfs.mod
new file mode 100644
index 00000000..6dea54e6
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/hfs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hfsplus.mod b/remote/modules/grub/data/etc/grub/i386-pc/hfsplus.mod
new file mode 100644
index 00000000..125bc296
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/hfsplus.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hfspluscomp.mod b/remote/modules/grub/data/etc/grub/i386-pc/hfspluscomp.mod
new file mode 100644
index 00000000..f8fea748
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/hfspluscomp.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/http.mod b/remote/modules/grub/data/etc/grub/i386-pc/http.mod
new file mode 100644
index 00000000..aafd9fcb
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/http.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hwmatch.mod b/remote/modules/grub/data/etc/grub/i386-pc/hwmatch.mod
new file mode 100644
index 00000000..77c5acc9
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/hwmatch.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/iorw.mod b/remote/modules/grub/data/etc/grub/i386-pc/iorw.mod
new file mode 100644
index 00000000..62fb885e
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/iorw.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/iso9660.mod b/remote/modules/grub/data/etc/grub/i386-pc/iso9660.mod
new file mode 100644
index 00000000..6decc762
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/iso9660.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/jfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/jfs.mod
new file mode 100644
index 00000000..100447a9
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/jfs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/jpeg.mod b/remote/modules/grub/data/etc/grub/i386-pc/jpeg.mod
new file mode 100644
index 00000000..e07167c5
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/jpeg.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/keylayouts.mod b/remote/modules/grub/data/etc/grub/i386-pc/keylayouts.mod
new file mode 100644
index 00000000..e2fb3d26
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/keylayouts.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/keystatus.mod b/remote/modules/grub/data/etc/grub/i386-pc/keystatus.mod
new file mode 100644
index 00000000..34eda64c
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/keystatus.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ldm.mod b/remote/modules/grub/data/etc/grub/i386-pc/ldm.mod
new file mode 100644
index 00000000..09397019
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/ldm.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/legacy_password_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/legacy_password_test.mod
new file mode 100644
index 00000000..6d3fbad4
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/legacy_password_test.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/legacycfg.mod b/remote/modules/grub/data/etc/grub/i386-pc/legacycfg.mod
new file mode 100644
index 00000000..a06c1d8e
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/legacycfg.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/linux.mod b/remote/modules/grub/data/etc/grub/i386-pc/linux.mod
new file mode 100644
index 00000000..7934b5fb
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/linux.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/linux16.mod b/remote/modules/grub/data/etc/grub/i386-pc/linux16.mod
new file mode 100644
index 00000000..0418bae7
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/linux16.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/loadenv.mod b/remote/modules/grub/data/etc/grub/i386-pc/loadenv.mod
new file mode 100644
index 00000000..af08f023
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/loadenv.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/loopback.mod b/remote/modules/grub/data/etc/grub/i386-pc/loopback.mod
new file mode 100644
index 00000000..2f04e009
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/loopback.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ls.mod b/remote/modules/grub/data/etc/grub/i386-pc/ls.mod
new file mode 100644
index 00000000..38e8bdc7
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/ls.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/lsacpi.mod b/remote/modules/grub/data/etc/grub/i386-pc/lsacpi.mod
new file mode 100644
index 00000000..1b6b95d6
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/lsacpi.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/lsapm.mod b/remote/modules/grub/data/etc/grub/i386-pc/lsapm.mod
new file mode 100644
index 00000000..e999c8c4
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/lsapm.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/lsmmap.mod b/remote/modules/grub/data/etc/grub/i386-pc/lsmmap.mod
new file mode 100644
index 00000000..2becf200
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/lsmmap.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/lspci.mod b/remote/modules/grub/data/etc/grub/i386-pc/lspci.mod
new file mode 100644
index 00000000..d634a0f3
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/lspci.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/luks.mod b/remote/modules/grub/data/etc/grub/i386-pc/luks.mod
new file mode 100644
index 00000000..baae79e9
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/luks.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/lvm.mod b/remote/modules/grub/data/etc/grub/i386-pc/lvm.mod
new file mode 100644
index 00000000..1e38f71a
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/lvm.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/lzopio.mod b/remote/modules/grub/data/etc/grub/i386-pc/lzopio.mod
new file mode 100644
index 00000000..35a70758
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/lzopio.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/macbless.mod b/remote/modules/grub/data/etc/grub/i386-pc/macbless.mod
new file mode 100644
index 00000000..454d4b18
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/macbless.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/macho.mod b/remote/modules/grub/data/etc/grub/i386-pc/macho.mod
new file mode 100644
index 00000000..43ff2400
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/macho.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/mda_text.mod b/remote/modules/grub/data/etc/grub/i386-pc/mda_text.mod
new file mode 100644
index 00000000..aadfd666
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/mda_text.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/mdraid09.mod b/remote/modules/grub/data/etc/grub/i386-pc/mdraid09.mod
new file mode 100644
index 00000000..d28b8e0d
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/mdraid09.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/mdraid09_be.mod b/remote/modules/grub/data/etc/grub/i386-pc/mdraid09_be.mod
new file mode 100644
index 00000000..477cdf86
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/mdraid09_be.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/mdraid1x.mod b/remote/modules/grub/data/etc/grub/i386-pc/mdraid1x.mod
new file mode 100644
index 00000000..c2e0604a
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/mdraid1x.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/memdisk.mod b/remote/modules/grub/data/etc/grub/i386-pc/memdisk.mod
new file mode 100644
index 00000000..dbea6234
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/memdisk.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/memrw.mod b/remote/modules/grub/data/etc/grub/i386-pc/memrw.mod
new file mode 100644
index 00000000..7029e0c4
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/memrw.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/minicmd.mod b/remote/modules/grub/data/etc/grub/i386-pc/minicmd.mod
new file mode 100644
index 00000000..1f734a86
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/minicmd.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/minix.mod b/remote/modules/grub/data/etc/grub/i386-pc/minix.mod
new file mode 100644
index 00000000..2eced0d6
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/minix.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/minix2.mod b/remote/modules/grub/data/etc/grub/i386-pc/minix2.mod
new file mode 100644
index 00000000..48aced6d
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/minix2.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/minix2_be.mod b/remote/modules/grub/data/etc/grub/i386-pc/minix2_be.mod
new file mode 100644
index 00000000..b2706bf9
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/minix2_be.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/minix3.mod b/remote/modules/grub/data/etc/grub/i386-pc/minix3.mod
new file mode 100644
index 00000000..96a15241
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/minix3.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/minix3_be.mod b/remote/modules/grub/data/etc/grub/i386-pc/minix3_be.mod
new file mode 100644
index 00000000..5cac8129
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/minix3_be.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/minix_be.mod b/remote/modules/grub/data/etc/grub/i386-pc/minix_be.mod
new file mode 100644
index 00000000..4862b67d
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/minix_be.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/mmap.mod b/remote/modules/grub/data/etc/grub/i386-pc/mmap.mod
new file mode 100644
index 00000000..f2803d78
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/mmap.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/moddep.lst b/remote/modules/grub/data/etc/grub/i386-pc/moddep.lst
new file mode 100644
index 00000000..57590dd9
--- /dev/null
+++ b/remote/modules/grub/data/etc/grub/i386-pc/moddep.lst
@@ -0,0 +1,259 @@
+squash4: xzio gzio lzopio fshelp
+search_fs_uuid:
+legacycfg: linux gcry_md5 crypto password normal
+date: datetime normal
+bfs:
+uhci: pci usb
+multiboot2: boot video net acpi relocator mmap lsapm vbe
+gcry_twofish: crypto
+cpio_be: archelp
+cmostest:
+priority_queue:
+gcry_rijndael: crypto
+freedos: boot video relocator chain
+echo: extcmd
+cpio: archelp
+xzio: crypto
+part_sun:
+hfspluscomp: gzio hfsplus
+gcry_sha512: crypto
+gcry_cast5: crypto
+boot:
+setjmp_test: setjmp functional_test
+odc: archelp
+ls: extcmd normal
+gzio:
+cbmemc: cbtable terminfo normal
+video:
+test_blockarg: extcmd normal
+gfxterm: video font
+cbtable:
+gcry_tiger: crypto
+gcry_serpent: crypto
+aout:
+macbless: disk
+gcry_blowfish: crypto
+trig:
+plan9: boot video extcmd relocator
+extcmd:
+at_keyboard: boot keylayouts
+videoinfo: video
+testspeed: extcmd normal
+pxe: boot net
+minix:
+keylayouts:
+xnu_uuid: gcry_md5
+usbtest: usb
+usbms: usb scsi
+reboot: relocator
+morse:
+help: extcmd normal
+part_msdos:
+http: net
+gdb: backtrace serial
+gcry_rsa: mpi verify
+cbtime: cbtable
+blocklist:
+probe: extcmd
+pbkdf2: crypto
+gcry_rfc2268: crypto
+ufs1_be:
+nativedisk:
+gcry_camellia: crypto
+fat:
+exfctest: functional_test
+pci:
+parttool: normal
+lzopio: crypto
+linux: boot video relocator mmap vbe normal
+gcry_md4: crypto
+zfsinfo: zfs
+usb_keyboard: keylayouts usb
+pxechain: boot video pxe relocator
+gcry_md5: crypto
+fshelp:
+ehci: boot pci usb cs5536
+bitmap_scale: bitmap
+ata: scsi
+datetime:
+usbserial_common: usb serial
+syslinuxcfg: extcmd normal
+net: priority_queue boot datetime bufio
+gcry_des: crypto
+div_test: functional_test
+time:
+reiserfs: fshelp
+dm_nv: diskfilter
+datehook: datetime normal
+mdraid09_be: diskfilter
+efiemu: crypto acpi cpuid gcry_crc
+backtrace:
+ahci: boot pci ata
+kernel:
+video_cirrus: video pci video_fb
+part_plan:
+gcry_seed: crypto
+minix_be:
+crypto:
+video_colors:
+test:
+terminal:
+part_dvh:
+lsacpi: extcmd acpi
+jpeg: bufio bitmap
+bsd: boot video aout extcmd gcry_md5 crypto cpuid elf relocator serial mmap vbe
+memdisk:
+gfxmenu: video gfxterm trig bitmap_scale video_colors bitmap normal font
+cmp:
+acpi: extcmd mmap
+xfs: fshelp
+elf:
+cpuid: extcmd
+affs: fshelp
+usb: pci
+videotest: video gfxmenu font
+tr: extcmd
+testload:
+relocator: mmap
+play:
+gfxterm_menu: video_fb functional_test procfs normal font
+cbfs: archelp
+adler32: crypto
+progress: normal
+password: crypto normal
+part_sunpc:
+video_fb:
+tftp: priority_queue net
+sleep: extcmd normal
+serial: extcmd terminfo
+search_fs_file:
+gcry_sha256: crypto
+gcry_rmd160: crypto
+exfat:
+search: search_fs_uuid extcmd search_fs_file search_label
+mdraid09: diskfilter
+chain: boot video relocator
+mpi: crypto
+memrw: extcmd
+cs5536: pci
+password_pbkdf2: gcry_sha512 pbkdf2 crypto normal
+mdraid1x: diskfilter
+linux16: boot video relocator mmap
+gcry_crc: crypto
+configfile: normal
+zfscrypt: gcry_rijndael extcmd pbkdf2 crypto zfs gcry_sha1
+signature_test: functional_test procfs
+raid5rec: diskfilter
+pcidump: extcmd pci
+gcry_arcfour: crypto
+sendkey: boot extcmd
+part_dfly:
+minix2_be:
+gettext:
+pbkdf2_test: pbkdf2 gcry_sha1 functional_test
+hello: extcmd
+vga_text:
+usbserial_pl2303: usbserial_common usb serial
+hashsum: extcmd crypto normal
+xnu_uuid_test: functional_test
+regexp: extcmd normal
+part_gpt:
+ohci: boot pci usb cs5536
+gptsync: disk
+zfs: gzio
+part_apple:
+hdparm: extcmd
+bufio:
+btrfs: gzio lzopio
+bitmap:
+true:
+terminfo: extcmd
+romfs: fshelp
+ntfscomp: ntfs
+hfs:
+gcry_dsa: mpi verify
+cmdline_cat_test: video_fb functional_test procfs normal font
+biosdisk:
+ufs1:
+offsetio:
+ntldr: boot video relocator chain
+legacy_password_test: legacycfg functional_test
+setjmp:
+ufs2:
+nilfs2: fshelp
+lsmmap:
+gcry_sha1: crypto
+cmosdump:
+915resolution:
+mmap: boot
+tar: archelp
+png: bufio bitmap
+lspci: extcmd pci
+hfsplus: fshelp
+cbls: cbtable
+tga: bufio bitmap
+minix2:
+setpci: extcmd pci
+scsi:
+pata: pci ata
+minix3:
+lvm: diskfilter
+lsapm:
+functional_test: video extcmd video_fb btrfs
+eval: normal
+iso9660: fshelp
+crc64: crypto
+vbe: video video_fb
+udf: fshelp
+search_label:
+raid6rec: diskfilter
+msdospart: parttool disk
+mda_text:
+archelp:
+procfs:
+minix3_be:
+halt: extcmd acpi
+xnu: boot video extcmd bitmap_scale efiemu relocator bitmap macho
+read:
+multiboot: boot video net relocator mmap lsapm vbe
+keystatus: extcmd
+cryptodisk: extcmd crypto procfs
+truecrypt: boot gzio video relocator mmap
+normal: boot extcmd crypto terminal gettext
+geli: gcry_sha512 pbkdf2 crypto gcry_sha256 cryptodisk
+spkmodem: terminfo
+gcry_idea: crypto
+video_bochs: video pci video_fb
+verify: extcmd crypto mpi gcry_sha1
+sfs: fshelp
+part_amiga:
+luks: pbkdf2 crypto cryptodisk
+loopback: extcmd
+jfs:
+gfxterm_background: gfxterm video extcmd bitmap_scale video_colors bitmap
+usbserial_usbdebug: usbserial_common usb serial
+part_acorn:
+newc: archelp
+macho:
+iorw: extcmd
+hwmatch: pci normal
+cat: extcmd
+afs:
+sleep_test: datetime functional_test
+ldm: part_msdos part_gpt diskfilter
+hexdump: extcmd
+disk:
+usbserial_ftdi: usbserial_common usb serial
+minicmd:
+loadenv: extcmd disk
+gcry_whirlpool: crypto
+drivemap: boot extcmd mmap
+vga: video video_fb
+part_bsd: part_msdos
+font: video bufio
+ext2: fshelp
+diskfilter:
+videotest_checksum: video_fb functional_test font
+file: extcmd elf offsetio macho
+ntfs: fshelp
+all_video: vbe vga video_bochs video_cirrus
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/modinfo.sh b/remote/modules/grub/data/etc/grub/i386-pc/modinfo.sh
new file mode 100644
index 00000000..ee13a0dd
--- /dev/null
+++ b/remote/modules/grub/data/etc/grub/i386-pc/modinfo.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# User-controllable options
+grub_modinfo_target_cpu=i386
+grub_modinfo_platform=pc
+grub_disk_cache_stats=0
+grub_boot_time_stats=0
+grub_have_font_source=1
+
+# Autodetected config
+grub_have_asm_uscore=0
+grub_i8086_addr32="addr32"
+grub_i8086_data32="data32"
+grub_bss_start_symbol="__bss_start"
+grub_end_symbol="end"
+
+# Build environment
+grub_target_cc='gcc-4.7'
+grub_target_cc_version='gcc-4.7 (Ubuntu/Linaro 4.7.3-12ubuntu1) 4.7.3'
+grub_target_cflags=' -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -march=i386 -m32 -mrtd -mregparm=3 -falign-jumps=1 -falign-loops=1 -falign-functions=1 -freg-struct-return -mno-mmx -mno-sse -mno-sse2 -mno-3dnow -fno-dwarf2-cfi-asm -fno-asynchronous-unwind-tables -Qn -fno-stack-protector -Wtrampolines -Werror'
+grub_target_cppflags='-Wno-unused-but-set-variable -Wall -W -I$(top_srcdir)/include -I$(top_builddir)/include  -DGRUB_MACHINE_PCBIOS=1 -DGRUB_MACHINE=I386_PC -m32 -nostdinc -isystem /usr/lib/gcc/x86_64-linux-gnu/4.7/include'
+grub_target_ccasflags=' -g -m32'
+grub_target_ldflags=' -m32 -Wl,-melf_i386 -Wl,--build-id=none'
+grub_target_strip='strip'
+grub_target_nm='nm'
+grub_target_ranlib='ranlib'
+grub_target_objconf=''
+grub_target_obj2elf=''
+
+# Version
+grub_version="2.02~beta2"
+grub_package="grub"
+grub_package_string="GRUB 2.02~beta2-9"
+grub_package_version="2.02~beta2-9"
+grub_package_name="GRUB"
+grub_package_bugreport="bug-grub@gnu.org"
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/morse.mod b/remote/modules/grub/data/etc/grub/i386-pc/morse.mod
new file mode 100644
index 00000000..c32f7049
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/morse.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/mpi.mod b/remote/modules/grub/data/etc/grub/i386-pc/mpi.mod
new file mode 100644
index 00000000..4bbbee3d
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/mpi.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/msdospart.mod b/remote/modules/grub/data/etc/grub/i386-pc/msdospart.mod
new file mode 100644
index 00000000..05ecea4b
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/msdospart.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/multiboot.mod b/remote/modules/grub/data/etc/grub/i386-pc/multiboot.mod
new file mode 100644
index 00000000..c5e09ddf
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/multiboot.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/multiboot2.mod b/remote/modules/grub/data/etc/grub/i386-pc/multiboot2.mod
new file mode 100644
index 00000000..313863c2
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/multiboot2.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/nativedisk.mod b/remote/modules/grub/data/etc/grub/i386-pc/nativedisk.mod
new file mode 100644
index 00000000..2adc04d6
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/nativedisk.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/net.mod b/remote/modules/grub/data/etc/grub/i386-pc/net.mod
new file mode 100644
index 00000000..33c17fb8
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/net.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/newc.mod b/remote/modules/grub/data/etc/grub/i386-pc/newc.mod
new file mode 100644
index 00000000..96b0ea98
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/newc.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/nilfs2.mod b/remote/modules/grub/data/etc/grub/i386-pc/nilfs2.mod
new file mode 100644
index 00000000..da0132dd
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/nilfs2.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/normal.mod b/remote/modules/grub/data/etc/grub/i386-pc/normal.mod
new file mode 100644
index 00000000..b53f47c6
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/normal.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ntfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/ntfs.mod
new file mode 100644
index 00000000..f6fbf761
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/ntfs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ntfscomp.mod b/remote/modules/grub/data/etc/grub/i386-pc/ntfscomp.mod
new file mode 100644
index 00000000..633a8747
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/ntfscomp.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ntldr.mod b/remote/modules/grub/data/etc/grub/i386-pc/ntldr.mod
new file mode 100644
index 00000000..d61667e1
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/ntldr.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/odc.mod b/remote/modules/grub/data/etc/grub/i386-pc/odc.mod
new file mode 100644
index 00000000..abc4a01e
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/odc.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/offsetio.mod b/remote/modules/grub/data/etc/grub/i386-pc/offsetio.mod
new file mode 100644
index 00000000..cc616a9b
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/offsetio.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ohci.mod b/remote/modules/grub/data/etc/grub/i386-pc/ohci.mod
new file mode 100644
index 00000000..8f1fbf32
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/ohci.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_acorn.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_acorn.mod
new file mode 100644
index 00000000..23c6dfd1
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/part_acorn.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_amiga.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_amiga.mod
new file mode 100644
index 00000000..fc74750e
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/part_amiga.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_apple.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_apple.mod
new file mode 100644
index 00000000..ff48dcba
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/part_apple.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_bsd.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_bsd.mod
new file mode 100644
index 00000000..e0af3dfb
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/part_bsd.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_dfly.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_dfly.mod
new file mode 100644
index 00000000..3f7549a2
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/part_dfly.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_dvh.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_dvh.mod
new file mode 100644
index 00000000..c0697bbc
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/part_dvh.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_gpt.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_gpt.mod
new file mode 100644
index 00000000..83ce6bbd
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/part_gpt.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_msdos.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_msdos.mod
new file mode 100644
index 00000000..ff5780a3
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/part_msdos.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_plan.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_plan.mod
new file mode 100644
index 00000000..1fb1f9af
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/part_plan.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_sun.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_sun.mod
new file mode 100644
index 00000000..bf74b2c4
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/part_sun.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_sunpc.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_sunpc.mod
new file mode 100644
index 00000000..3799e643
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/part_sunpc.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/partmap.lst b/remote/modules/grub/data/etc/grub/i386-pc/partmap.lst
new file mode 100644
index 00000000..761233aa
--- /dev/null
+++ b/remote/modules/grub/data/etc/grub/i386-pc/partmap.lst
@@ -0,0 +1,11 @@
+part_acorn
+part_amiga
+part_apple
+part_bsd
+part_dfly
+part_dvh
+part_gpt
+part_msdos
+part_plan
+part_sun
+part_sunpc
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/parttool.lst b/remote/modules/grub/data/etc/grub/i386-pc/parttool.lst
new file mode 100644
index 00000000..68b4b5c4
--- /dev/null
+++ b/remote/modules/grub/data/etc/grub/i386-pc/parttool.lst
@@ -0,0 +1 @@
+msdos: msdospart
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/parttool.mod b/remote/modules/grub/data/etc/grub/i386-pc/parttool.mod
new file mode 100644
index 00000000..bd8d162d
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/parttool.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/password.mod b/remote/modules/grub/data/etc/grub/i386-pc/password.mod
new file mode 100644
index 00000000..4be1b2fd
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/password.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/password_pbkdf2.mod b/remote/modules/grub/data/etc/grub/i386-pc/password_pbkdf2.mod
new file mode 100644
index 00000000..d195763d
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/password_pbkdf2.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/pata.mod b/remote/modules/grub/data/etc/grub/i386-pc/pata.mod
new file mode 100644
index 00000000..b890127f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/pata.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/pbkdf2.mod b/remote/modules/grub/data/etc/grub/i386-pc/pbkdf2.mod
new file mode 100644
index 00000000..821c8cdf
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/pbkdf2.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/pbkdf2_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/pbkdf2_test.mod
new file mode 100644
index 00000000..cf7e2052
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/pbkdf2_test.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/pci.mod b/remote/modules/grub/data/etc/grub/i386-pc/pci.mod
new file mode 100644
index 00000000..1986684e
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/pci.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/pcidump.mod b/remote/modules/grub/data/etc/grub/i386-pc/pcidump.mod
new file mode 100644
index 00000000..1fd30f20
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/pcidump.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/plan9.mod b/remote/modules/grub/data/etc/grub/i386-pc/plan9.mod
new file mode 100644
index 00000000..3210286a
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/plan9.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/play.mod b/remote/modules/grub/data/etc/grub/i386-pc/play.mod
new file mode 100644
index 00000000..5b3d7636
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/play.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/png.mod b/remote/modules/grub/data/etc/grub/i386-pc/png.mod
new file mode 100644
index 00000000..18a3d543
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/png.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/priority_queue.mod b/remote/modules/grub/data/etc/grub/i386-pc/priority_queue.mod
new file mode 100644
index 00000000..5da44071
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/priority_queue.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/probe.mod b/remote/modules/grub/data/etc/grub/i386-pc/probe.mod
new file mode 100644
index 00000000..265955a8
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/probe.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/procfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/procfs.mod
new file mode 100644
index 00000000..3123ddb8
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/procfs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/progress.mod b/remote/modules/grub/data/etc/grub/i386-pc/progress.mod
new file mode 100644
index 00000000..1c1f1c75
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/progress.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/pxe.mod b/remote/modules/grub/data/etc/grub/i386-pc/pxe.mod
new file mode 100644
index 00000000..d56ae9b9
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/pxe.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/pxechain.mod b/remote/modules/grub/data/etc/grub/i386-pc/pxechain.mod
new file mode 100644
index 00000000..74333e72
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/pxechain.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/raid5rec.mod b/remote/modules/grub/data/etc/grub/i386-pc/raid5rec.mod
new file mode 100644
index 00000000..d2f6858e
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/raid5rec.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/raid6rec.mod b/remote/modules/grub/data/etc/grub/i386-pc/raid6rec.mod
new file mode 100644
index 00000000..5d798aa2
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/raid6rec.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/read.mod b/remote/modules/grub/data/etc/grub/i386-pc/read.mod
new file mode 100644
index 00000000..a24a6a5f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/read.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/reboot.mod b/remote/modules/grub/data/etc/grub/i386-pc/reboot.mod
new file mode 100644
index 00000000..e0e05c86
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/reboot.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/regexp.mod b/remote/modules/grub/data/etc/grub/i386-pc/regexp.mod
new file mode 100644
index 00000000..90e0b4e8
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/regexp.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/reiserfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/reiserfs.mod
new file mode 100644
index 00000000..bf12048e
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/reiserfs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/relocator.mod b/remote/modules/grub/data/etc/grub/i386-pc/relocator.mod
new file mode 100644
index 00000000..a82bce2f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/relocator.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/romfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/romfs.mod
new file mode 100644
index 00000000..aee8ffe7
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/romfs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/scsi.mod b/remote/modules/grub/data/etc/grub/i386-pc/scsi.mod
new file mode 100644
index 00000000..1f1659b7
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/scsi.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/search.mod b/remote/modules/grub/data/etc/grub/i386-pc/search.mod
new file mode 100644
index 00000000..b02e3a53
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/search.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/search_fs_file.mod b/remote/modules/grub/data/etc/grub/i386-pc/search_fs_file.mod
new file mode 100644
index 00000000..a0ee205c
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/search_fs_file.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/search_fs_uuid.mod b/remote/modules/grub/data/etc/grub/i386-pc/search_fs_uuid.mod
new file mode 100644
index 00000000..e8050f1d
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/search_fs_uuid.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/search_label.mod b/remote/modules/grub/data/etc/grub/i386-pc/search_label.mod
new file mode 100644
index 00000000..c0c2eb1f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/search_label.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/sendkey.mod b/remote/modules/grub/data/etc/grub/i386-pc/sendkey.mod
new file mode 100644
index 00000000..f70d3ea5
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/sendkey.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/serial.mod b/remote/modules/grub/data/etc/grub/i386-pc/serial.mod
new file mode 100644
index 00000000..a4709e0d
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/serial.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/setjmp.mod b/remote/modules/grub/data/etc/grub/i386-pc/setjmp.mod
new file mode 100644
index 00000000..b54bfdf7
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/setjmp.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/setjmp_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/setjmp_test.mod
new file mode 100644
index 00000000..08791725
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/setjmp_test.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/setpci.mod b/remote/modules/grub/data/etc/grub/i386-pc/setpci.mod
new file mode 100644
index 00000000..4068447a
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/setpci.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/sfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/sfs.mod
new file mode 100644
index 00000000..9bc0c539
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/sfs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/signature_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/signature_test.mod
new file mode 100644
index 00000000..0404260e
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/signature_test.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/sleep.mod b/remote/modules/grub/data/etc/grub/i386-pc/sleep.mod
new file mode 100644
index 00000000..03ea1523
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/sleep.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/sleep_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/sleep_test.mod
new file mode 100644
index 00000000..6643135b
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/sleep_test.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/spkmodem.mod b/remote/modules/grub/data/etc/grub/i386-pc/spkmodem.mod
new file mode 100644
index 00000000..64cccde5
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/spkmodem.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/squash4.mod b/remote/modules/grub/data/etc/grub/i386-pc/squash4.mod
new file mode 100644
index 00000000..9a955f2d
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/squash4.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/syslinuxcfg.mod b/remote/modules/grub/data/etc/grub/i386-pc/syslinuxcfg.mod
new file mode 100644
index 00000000..533ca6fc
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/syslinuxcfg.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/tar.mod b/remote/modules/grub/data/etc/grub/i386-pc/tar.mod
new file mode 100644
index 00000000..aa730d40
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/tar.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/terminal.lst b/remote/modules/grub/data/etc/grub/i386-pc/terminal.lst
new file mode 100644
index 00000000..2cb224c4
--- /dev/null
+++ b/remote/modules/grub/data/etc/grub/i386-pc/terminal.lst
@@ -0,0 +1,11 @@
+iat_keyboard: at_keyboard
+iserial: serial
+iserial_*: serial
+oaudio: morse
+ocbmemc: cbmemc
+ogfxterm: gfxterm
+omda_text: mda_text
+oserial: serial
+oserial_*: serial
+ospkmodem: spkmodem
+ovga_text: vga_text
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/terminal.mod b/remote/modules/grub/data/etc/grub/i386-pc/terminal.mod
new file mode 100644
index 00000000..e69ffeaa
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/terminal.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/terminfo.mod b/remote/modules/grub/data/etc/grub/i386-pc/terminfo.mod
new file mode 100644
index 00000000..802dde46
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/terminfo.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/test.mod b/remote/modules/grub/data/etc/grub/i386-pc/test.mod
new file mode 100644
index 00000000..a64efab1
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/test.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/test_blockarg.mod b/remote/modules/grub/data/etc/grub/i386-pc/test_blockarg.mod
new file mode 100644
index 00000000..aae21993
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/test_blockarg.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/testload.mod b/remote/modules/grub/data/etc/grub/i386-pc/testload.mod
new file mode 100644
index 00000000..7bc62b18
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/testload.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/testspeed.mod b/remote/modules/grub/data/etc/grub/i386-pc/testspeed.mod
new file mode 100644
index 00000000..cdef4145
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/testspeed.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/tftp.mod b/remote/modules/grub/data/etc/grub/i386-pc/tftp.mod
new file mode 100644
index 00000000..631c609f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/tftp.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/tga.mod b/remote/modules/grub/data/etc/grub/i386-pc/tga.mod
new file mode 100644
index 00000000..01e24f2a
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/tga.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/time.mod b/remote/modules/grub/data/etc/grub/i386-pc/time.mod
new file mode 100644
index 00000000..41ede536
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/time.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/tr.mod b/remote/modules/grub/data/etc/grub/i386-pc/tr.mod
new file mode 100644
index 00000000..0ed46ded
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/tr.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/trig.mod b/remote/modules/grub/data/etc/grub/i386-pc/trig.mod
new file mode 100644
index 00000000..845a9eda
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/trig.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/true.mod b/remote/modules/grub/data/etc/grub/i386-pc/true.mod
new file mode 100644
index 00000000..92a4871a
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/true.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/truecrypt.mod b/remote/modules/grub/data/etc/grub/i386-pc/truecrypt.mod
new file mode 100644
index 00000000..3085be5d
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/truecrypt.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/udf.mod b/remote/modules/grub/data/etc/grub/i386-pc/udf.mod
new file mode 100644
index 00000000..32ff4e9f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/udf.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ufs1.mod b/remote/modules/grub/data/etc/grub/i386-pc/ufs1.mod
new file mode 100644
index 00000000..a5d0212a
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/ufs1.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ufs1_be.mod b/remote/modules/grub/data/etc/grub/i386-pc/ufs1_be.mod
new file mode 100644
index 00000000..0d8cda79
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/ufs1_be.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ufs2.mod b/remote/modules/grub/data/etc/grub/i386-pc/ufs2.mod
new file mode 100644
index 00000000..c37ec580
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/ufs2.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/uhci.mod b/remote/modules/grub/data/etc/grub/i386-pc/uhci.mod
new file mode 100644
index 00000000..15fac145
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/uhci.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usb.mod b/remote/modules/grub/data/etc/grub/i386-pc/usb.mod
new file mode 100644
index 00000000..d871918f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/usb.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usb_keyboard.mod b/remote/modules/grub/data/etc/grub/i386-pc/usb_keyboard.mod
new file mode 100644
index 00000000..5387c303
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/usb_keyboard.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usbms.mod b/remote/modules/grub/data/etc/grub/i386-pc/usbms.mod
new file mode 100644
index 00000000..bb141fba
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/usbms.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usbserial_common.mod b/remote/modules/grub/data/etc/grub/i386-pc/usbserial_common.mod
new file mode 100644
index 00000000..1867a4eb
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/usbserial_common.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usbserial_ftdi.mod b/remote/modules/grub/data/etc/grub/i386-pc/usbserial_ftdi.mod
new file mode 100644
index 00000000..b5944cf2
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/usbserial_ftdi.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usbserial_pl2303.mod b/remote/modules/grub/data/etc/grub/i386-pc/usbserial_pl2303.mod
new file mode 100644
index 00000000..60209da6
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/usbserial_pl2303.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usbserial_usbdebug.mod b/remote/modules/grub/data/etc/grub/i386-pc/usbserial_usbdebug.mod
new file mode 100644
index 00000000..7b0d3825
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/usbserial_usbdebug.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usbtest.mod b/remote/modules/grub/data/etc/grub/i386-pc/usbtest.mod
new file mode 100644
index 00000000..575871c0
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/usbtest.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/vbe.mod b/remote/modules/grub/data/etc/grub/i386-pc/vbe.mod
new file mode 100644
index 00000000..dd0b1b88
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/vbe.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/verify.mod b/remote/modules/grub/data/etc/grub/i386-pc/verify.mod
new file mode 100644
index 00000000..c9d8f954
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/verify.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/vga.mod b/remote/modules/grub/data/etc/grub/i386-pc/vga.mod
new file mode 100644
index 00000000..1a815f40
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/vga.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/vga_text.mod b/remote/modules/grub/data/etc/grub/i386-pc/vga_text.mod
new file mode 100644
index 00000000..d5af9505
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/vga_text.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/video.lst b/remote/modules/grub/data/etc/grub/i386-pc/video.lst
new file mode 100644
index 00000000..6ca853e6
--- /dev/null
+++ b/remote/modules/grub/data/etc/grub/i386-pc/video.lst
@@ -0,0 +1,4 @@
+vbe
+vga
+video_bochs
+video_cirrus
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/video.mod b/remote/modules/grub/data/etc/grub/i386-pc/video.mod
new file mode 100644
index 00000000..d3441f3f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/video.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/video_bochs.mod b/remote/modules/grub/data/etc/grub/i386-pc/video_bochs.mod
new file mode 100644
index 00000000..319c39ec
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/video_bochs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/video_cirrus.mod b/remote/modules/grub/data/etc/grub/i386-pc/video_cirrus.mod
new file mode 100644
index 00000000..e0f4c0e2
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/video_cirrus.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/video_colors.mod b/remote/modules/grub/data/etc/grub/i386-pc/video_colors.mod
new file mode 100644
index 00000000..85feaaf3
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/video_colors.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/video_fb.mod b/remote/modules/grub/data/etc/grub/i386-pc/video_fb.mod
new file mode 100644
index 00000000..7c10b8fa
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/video_fb.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/videoinfo.mod b/remote/modules/grub/data/etc/grub/i386-pc/videoinfo.mod
new file mode 100644
index 00000000..db22eaf6
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/videoinfo.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/videotest.mod b/remote/modules/grub/data/etc/grub/i386-pc/videotest.mod
new file mode 100644
index 00000000..a582d98f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/videotest.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/videotest_checksum.mod b/remote/modules/grub/data/etc/grub/i386-pc/videotest_checksum.mod
new file mode 100644
index 00000000..bca57a27
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/videotest_checksum.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/xfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/xfs.mod
new file mode 100644
index 00000000..48a3ba71
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/xfs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/xnu.mod b/remote/modules/grub/data/etc/grub/i386-pc/xnu.mod
new file mode 100644
index 00000000..1c00cf93
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/xnu.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid.mod b/remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid.mod
new file mode 100644
index 00000000..590fdea5
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid_test.mod
new file mode 100644
index 00000000..bcd305f3
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid_test.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/xzio.mod b/remote/modules/grub/data/etc/grub/i386-pc/xzio.mod
new file mode 100644
index 00000000..87994658
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/xzio.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/zfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/zfs.mod
new file mode 100644
index 00000000..7dadca8f
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/zfs.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/zfscrypt.mod b/remote/modules/grub/data/etc/grub/i386-pc/zfscrypt.mod
new file mode 100644
index 00000000..2898a7be
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/zfscrypt.mod differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/zfsinfo.mod b/remote/modules/grub/data/etc/grub/i386-pc/zfsinfo.mod
new file mode 100644
index 00000000..b4db4a9e
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/i386-pc/zfsinfo.mod differ
diff --git a/remote/modules/grub/data/etc/grub/locale/en_AU.mo b/remote/modules/grub/data/etc/grub/locale/en_AU.mo
new file mode 100644
index 00000000..464f3e33
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/locale/en_AU.mo differ
diff --git a/remote/modules/grub/data/etc/grub/locale/en_CA.mo b/remote/modules/grub/data/etc/grub/locale/en_CA.mo
new file mode 100644
index 00000000..4ab757f9
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/locale/en_CA.mo differ
diff --git a/remote/modules/grub/data/etc/grub/locale/en_GB.mo b/remote/modules/grub/data/etc/grub/locale/en_GB.mo
new file mode 100644
index 00000000..31c36dab
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/locale/en_GB.mo differ
diff --git a/remote/modules/grub/data/etc/grub/locale/pt.mo b/remote/modules/grub/data/etc/grub/locale/pt.mo
new file mode 100644
index 00000000..5bc34b84
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/locale/pt.mo differ
diff --git a/remote/modules/grub/data/etc/grub/locale/pt_BR.mo b/remote/modules/grub/data/etc/grub/locale/pt_BR.mo
new file mode 100644
index 00000000..5111d77c
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/locale/pt_BR.mo differ
diff --git a/remote/modules/grub/data/etc/grub/unicode.pf2 b/remote/modules/grub/data/etc/grub/unicode.pf2
new file mode 100644
index 00000000..b87a7767
Binary files /dev/null and b/remote/modules/grub/data/etc/grub/unicode.pf2 differ
diff --git a/remote/modules/grub/grub b/remote/modules/grub/grub
new file mode 120000
index 00000000..2c8276e7
--- /dev/null
+++ b/remote/modules/grub/grub
@@ -0,0 +1 @@
+grub
\ No newline at end of file
diff --git a/remote/modules/grub/module.build b/remote/modules/grub/module.build
new file mode 100644
index 00000000..119ea7bf
--- /dev/null
+++ b/remote/modules/grub/module.build
@@ -0,0 +1,18 @@
+fetch_source() {
+	:
+}
+
+build() {
+	COPYLIST="list_dpkg_output"
+	[ -e "$COPYLIST" ] && rm "$COPYLIST"
+
+	list_packet_files >> "$COPYLIST"
+	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+
+	return 0
+}
+
+post_copy() {
+	:
+}
+
diff --git a/remote/modules/grub/module.conf b/remote/modules/grub/module.conf
new file mode 100644
index 00000000..9af3f571
--- /dev/null
+++ b/remote/modules/grub/module.conf
@@ -0,0 +1,9 @@
+REQUIRED_BINARIES="	
+			grub-install
+			grub-mkconfig
+			grub-probe
+			grub-bios-setup
+"
+REQUIRED_DIRECTORIES="
+		     /usr/lib/grub/	
+"
diff --git a/remote/modules/grub/module.conf.ubuntu b/remote/modules/grub/module.conf.ubuntu
new file mode 100644
index 00000000..b4b3256e
--- /dev/null
+++ b/remote/modules/grub/module.conf.ubuntu
@@ -0,0 +1,7 @@
+REQUIRED_CONTENT_PACKAGES="
+			grub2-common
+			grub-common
+			grub-gfxpayload-lists
+			grub-pc
+			grub-pc-bin  
+"
diff --git a/remote/rootfs/rootfs-stage31/data/inc/functions b/remote/rootfs/rootfs-stage31/data/inc/functions
index 5cc56dd7..b5d8f31d 100644
--- a/remote/rootfs/rootfs-stage31/data/inc/functions
+++ b/remote/rootfs/rootfs-stage31/data/inc/functions
@@ -43,7 +43,22 @@ download() {
 	
 	local FILE_URL="$1"
 	local TARGET_PATH="$2"
+
+#Files from HD	
+if [ "$HDD" = "yes" ]; then
+   
+    cp  /boot/$FILE_URL  $TARGET_PATH
+    RET=$?
+         if [ "x$RET" != "x0" -o ! -e "$TARGET_PATH" ]; then
+              echo "Error - Copying '$FILE_URL' from HD failed. Exit Code: $RET"
+              usleep 50000 # 50ms
+         else
+              echo "Successfully copied '$FILE_URL' from HD."
+              return 0
+         fi
+
 	
+else	# Normal Download from server	
 	# Shuffle server list
 	local SERVERS=$(for SERVER in $SLX_CONFIG_SERVERS $SLX_KCL_SERVERS; do echo "$RANDOM $SERVER"; done | sort -u | sed -r 's/^[0-9]+ //')
 	
@@ -65,6 +80,7 @@ download() {
 	done
 	# Max retries reached, no success :-(
 	return 1
+fi
 }
 
 # Add benchmark event to var, including uptime as prefix
diff --git a/remote/rootfs/rootfs-stage31/data/inc/parse_kcl b/remote/rootfs/rootfs-stage31/data/inc/parse_kcl
index 13f9c467..8c81f65d 100644
--- a/remote/rootfs/rootfs-stage31/data/inc/parse_kcl
+++ b/remote/rootfs/rootfs-stage31/data/inc/parse_kcl
@@ -43,6 +43,10 @@ for opts in ${KCL}; do
 			GFX=nvidia ;;
 		ati|amd)
 			GFX=amd ;;
+		hdd_boot=*)
+		           HDD='yes'
+           		   HDD_BOOT=${opts#hdd_boot=} ;;   # all stages got from hd
+
 	esac
 done
 
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 9daa6d58..c9adadeb 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -69,6 +69,13 @@ if [ $SPLASH -eq 0 ]; then
 	[ $DEBUG -ge 1 ] && echo "4 4 1 7" > /proc/sys/kernel/printk || echo "1 1 0 1" >/proc/sys/kernel/printk
 fi
 
+case $HDD in
+yes)
+	mkdir /boot
+	busybox mount /dev/$HDD_BOOT /boot
+;;
+esac
+
 [ $DEBUG -ge 4 ] && drop_shell "Requested Debug Shell: before network."
 
 . "/inc/setup_network" || . "/inc/setup_network_retry" || drop_shell "Error setting up network"
diff --git a/remote/rootfs/rootfs-stage32/module.conf b/remote/rootfs/rootfs-stage32/module.conf
index 3a160a36..4e1350a6 100644
--- a/remote/rootfs/rootfs-stage32/module.conf
+++ b/remote/rootfs/rootfs-stage32/module.conf
@@ -38,6 +38,7 @@ REQUIRED_BINARIES="
 	getent
 	ldconfig
 	grep
+	wget
 "
 REQUIRED_LIBRARIES="
 	libcap
diff --git a/remote/targets/stage32-curitiba/grub b/remote/targets/stage32-curitiba/grub
new file mode 120000
index 00000000..5d8aa189
--- /dev/null
+++ b/remote/targets/stage32-curitiba/grub
@@ -0,0 +1 @@
+../../modules/grub/
\ No newline at end of file
diff --git a/server/configs/curitiba/hdd-boot b/server/configs/curitiba/hdd-boot
new file mode 120000
index 00000000..0fb7b3a9
--- /dev/null
+++ b/server/configs/curitiba/hdd-boot
@@ -0,0 +1 @@
+../../modules/hdd-boot/
\ No newline at end of file
diff --git a/server/modules/hdd-boot/etc/systemd/system/hdd_boot.service b/server/modules/hdd-boot/etc/systemd/system/hdd_boot.service
new file mode 100644
index 00000000..ed4fdcb7
--- /dev/null
+++ b/server/modules/hdd-boot/etc/systemd/system/hdd_boot.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Runs the OpenSLX Hdd-boot Tool
+After=tmp.target
+Wants=tmp.target
+DefaultDependencies=no
+ConditionPathIsMountPoint=/boot
+
+[Service]
+Type=oneshot
+ExecStart=/opt/openslx/scripts/systemd-hdd_boot
+RemainAfterExit=yes
diff --git a/server/modules/hdd-boot/etc/systemd/system/multi-user.target.wants/hdd_boot.service b/server/modules/hdd-boot/etc/systemd/system/multi-user.target.wants/hdd_boot.service
new file mode 120000
index 00000000..515407f5
--- /dev/null
+++ b/server/modules/hdd-boot/etc/systemd/system/multi-user.target.wants/hdd_boot.service
@@ -0,0 +1 @@
+../hdd_boot.service
\ No newline at end of file
diff --git a/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot b/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot
new file mode 100755
index 00000000..adf5f002
--- /dev/null
+++ b/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot
@@ -0,0 +1,122 @@
+#!/bin/ash
+
+boot_download () {
+
+	# Downloading all in SLX_BASE_PATH to  /boot  Example: Ubuntu_1404_x64
+	# wget -N,  update if the file has been changed 
+
+
+	cd /boot
+        echo "Downloading $SLX_BASE_PATH ................."
+        wget -N -r --tries=3 --timeout=5 --quiet -nH -l1 --no-parent --reject="index.html*" --reject="$SLX_BASE_PATH.*" $SLXSRV/$SLX_BASE_PATH #<---- ok =), but try with -nc too
+	RET=$?
+        [ $RET != 0 ] && { echo "Error - downloading 'http://$SLXSRV/$SLX_BASE_PATH/' via wget failed."; exit 1; } ||{ echo "Successfully downloaded  'http://$SLXSRV/$SLX_BASE_PATH' via wget."; return 0; }
+
+}
+
+# Getting informations from cmdline
+read KCL < "/proc/cmdline"
+for opts in ${KCL}; do
+        case "${opts}" in
+        slxbase=*)      # BASE_PATH Example Ubuntu_1404_x64
+                        SLX_BASE_PATH=${opts#slxbase=} ;;
+        slxsrv=*)
+                        #SLX IP server info
+                        SLXSRV=${opts#slxsrv=} ;;
+
+        BOOT_IMAGE=*)
+                        BOOT_IMAGE=${opts} ;;
+
+        initrd=*)
+                        initrd=${opts} ;;
+
+
+        esac
+done
+
+KCL=$(echo "$KCL" | sed "s|SLX_BASE_PATH|$SLX_BASE_PATH|g;s|$BOOT_IMAGE||g;s|$initrd||g")
+
+
+# if SLX_BASE_PATH already exists, just update. Does not make the menu again.
+[ -d  /boot/$SLX_BASE_PATH ] && { boot_download; echo "$SLX_BASE_PATH updated"; exit 0; } || boot_download
+
+
+# Getting informations about the disks and where is the boot partition
+CONFIG_PATH='/opt/openslx/config'
+. $CONFIG_PATH
+
+echo " SLX_CHOOSEN_DISK $SLX_CHOOSEN_DISK" #Just for test
+
+        case $SLX_CHOOSEN_DISK in
+
+        sda) GRUB_DISK=hd0 ;;
+        sdb) GRUB_DISK=hd1 ;;
+        sdc) GRUB_DISK=hd2 ;;
+        sdd) GRUB_DISK=hd3 ;;
+        sde) GRUB_DISK=hd4 ;;
+	  *) echo "GRUB_DISK was not found"
+	     exit 1 ;;
+        esac
+
+echo "GRUB_DISK $GRUB_DISK" #Just for test
+
+
+        case $SLX_PARTITION_TYPE in
+
+        GPT)	sgdisk -p /dev/$SLX_CHOOSEN_DISK | grep EF02 > /dev/null
+		[ $? != 0 ] && { echo "Could not find a BIOS boot partition "; exit 1; }
+
+		SLX_BOOT_ID=$(sgdisk -p /dev/$SLX_CHOOSEN_DISK | grep /boot | cut -c1-6 | sed -e 's/^ *//' -e 's/ *$//' ) # <------- is it working ? remove both trailing and leading spaces with sed
+		echo " SLX_BOOT_ID $SLX_BOOT_ID" #Just for test
+		
+		SLX_BOOT_PARTITION=gpt$SLX_BOOT_ID
+		echo " SLX_BOOT_PARTITION $SLX_BOOT_PARTITION" # Just for test
+
+	;;
+	MSDOS)
+		SLX_BOOT_ID=$(grep boot $CONFIG_PATH |cut -f1 | tr '#' '\n' | cut -d, -f1)
+		echo " SLX_BOOT_ID $SLX_BOOT_ID" #Just for test
+
+		SLX_BOOT_PARTITION=msdos$(grep $SLX_BOOT_ID disk.partition | cut -c9)
+		echo " SLX_BOOT_PARTITION $SLX_BOOT_PARTITION" #Just for test
+	;;
+	esac
+
+# Installing GRUB
+# First, copy from etc
+
+ if [ ! -d /boot/grub ]; then
+ 
+ [ -d  /etc/grub ] ||  { echo "Could not find /grub directory"; exit 1; }
+ cp -r /etc/grub /boot/
+ cd /
+ grub-install --boot-directory=/boot /dev/$SLX_CHOOSEN_DISK
+ RET=$?
+ [ $RET != 0 ] && { echo "Could not install GRUB";  exit 1; } ||  echo "GRUB successfully installed"
+ fi
+
+#GRUB ok, so lets make the menu
+
+cd /boot/grub/
+[ -e  grub.cfg ] ||  { echo "Could not find grub.cfg"; exit 1; }
+	
+cat <<EOF >> grub.cfg
+#########################
+        menuentry '$SLX_BASE_PATH' { 
+        linux ($GRUB_DISK,$SLX_BOOT_PARTITION)/$SLX_BASE_PATH/kernel  hdd_boot=$SLX_CHOOSEN_DISK$SLX_BOOT_ID $KCL 
+        initrd ($GRUB_DISK,$SLX_BOOT_PARTITION)/$SLX_BASE_PATH/initramfs-stage31
+}
+#########################
+EOF
+
+echo "GRUB INSTALLED =) =)"
+
+true
+
+
+
+
+
+
+
+
-- 
cgit v1.2.3-55-g7522


From 69b25bedc6727931aab0bb4493148cd55d17ffd9 Mon Sep 17 00:00:00 2001
From: Michael Pereira
Date: Thu, 26 Feb 2015 15:31:15 +0100
Subject: [hdd-boot] code review

---
 remote/modules/grub/grub                           |   1 -
 remote/modules/grub/module.conf                    |   4 +-
 remote/modules/grub/module.conf.ubuntu             |   2 +-
 .../hdd-boot/opt/openslx/scripts/systemd-hdd_boot  | 129 ++++------
 vim.log                                            | 282 +++++++++++++++++++++
 5 files changed, 331 insertions(+), 87 deletions(-)
 delete mode 120000 remote/modules/grub/grub
 create mode 100644 vim.log

(limited to 'server/modules')

diff --git a/remote/modules/grub/grub b/remote/modules/grub/grub
deleted file mode 120000
index 2c8276e7..00000000
--- a/remote/modules/grub/grub
+++ /dev/null
@@ -1 +0,0 @@
-grub
\ No newline at end of file
diff --git a/remote/modules/grub/module.conf b/remote/modules/grub/module.conf
index 9af3f571..61c3deac 100644
--- a/remote/modules/grub/module.conf
+++ b/remote/modules/grub/module.conf
@@ -1,9 +1,9 @@
-REQUIRED_BINARIES="	
+REQUIRED_BINARIES="
 			grub-install
 			grub-mkconfig
 			grub-probe
 			grub-bios-setup
 "
 REQUIRED_DIRECTORIES="
-		     /usr/lib/grub/	
+			/usr/lib/grub/
 "
diff --git a/remote/modules/grub/module.conf.ubuntu b/remote/modules/grub/module.conf.ubuntu
index b4b3256e..bca61a90 100644
--- a/remote/modules/grub/module.conf.ubuntu
+++ b/remote/modules/grub/module.conf.ubuntu
@@ -3,5 +3,5 @@ REQUIRED_CONTENT_PACKAGES="
 			grub-common
 			grub-gfxpayload-lists
 			grub-pc
-			grub-pc-bin  
+			grub-pc-bin 
 "
diff --git a/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot b/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot
index adf5f002..3696dc7b 100755
--- a/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot
+++ b/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot
@@ -1,110 +1,73 @@
-#!/bin/ash
+#!/bin/bash
 
+# Downloading all in SLX_BASE_PATH to  /boot  Example: Ubuntu_1404_x64
+# wget -N,  update if the file has been changed
 boot_download () {
-
-	# Downloading all in SLX_BASE_PATH to  /boot  Example: Ubuntu_1404_x64
-	# wget -N,  update if the file has been changed 
-
-
-	cd /boot
-        echo "Downloading $SLX_BASE_PATH ................."
-        wget -N -r --tries=3 --timeout=5 --quiet -nH -l1 --no-parent --reject="index.html*" --reject="$SLX_BASE_PATH.*" $SLXSRV/$SLX_BASE_PATH #<---- ok =), but try with -nc too
+	echo "Downloading $SLX_BASE_PATH ................."
+	wget -P /boot -N -r --tries=3 --timeout=5 --quiet -nH -l1 --no-parent --reject="index.html*" --reject="$SLX_BASE_PATH.*" $SLXSRV/$SLX_BASE_PATH #<---- ok =), but try with -nc too
 	RET=$?
-        [ $RET != 0 ] && { echo "Error - downloading 'http://$SLXSRV/$SLX_BASE_PATH/' via wget failed."; exit 1; } ||{ echo "Successfully downloaded  'http://$SLXSRV/$SLX_BASE_PATH' via wget."; return 0; }
-
+	[ $RET != 0 ] && { echo "Error - downloading 'http://$SLXSRV/$SLX_BASE_PATH/' via wget failed."; exit 1; } ||{ echo "Successfully downloaded  'http://$SLXSRV/$SLX_BASE_PATH' via wget."; return 0; }
 }
 
 # Getting informations from cmdline
 read KCL < "/proc/cmdline"
 for opts in ${KCL}; do
-        case "${opts}" in
-        slxbase=*)      # BASE_PATH Example Ubuntu_1404_x64
-                        SLX_BASE_PATH=${opts#slxbase=} ;;
-        slxsrv=*)
-                        #SLX IP server info
-                        SLXSRV=${opts#slxsrv=} ;;
-
-        BOOT_IMAGE=*)
-                        BOOT_IMAGE=${opts} ;;
-
-        initrd=*)
-                        initrd=${opts} ;;
-
-
-        esac
+	case "${opts}" in
+		slxbase=*)      # BASE_PATH Example Ubuntu_1404_x64
+			SLX_BASE_PATH=${opts#slxbase=} ;;
+		slxsrv=*)
+			#SLX IP server info
+			SLXSRV=${opts#slxsrv=} ;;
+		BOOT_IMAGE=*)
+			BOOT_IMAGE=${opts} ;;
+		initrd=*)
+			initrd=${opts} ;;
+	esac
 done
-
 KCL=$(echo "$KCL" | sed "s|SLX_BASE_PATH|$SLX_BASE_PATH|g;s|$BOOT_IMAGE||g;s|$initrd||g")
 
-
 # if SLX_BASE_PATH already exists, just update. Does not make the menu again.
 [ -d  /boot/$SLX_BASE_PATH ] && { boot_download; echo "$SLX_BASE_PATH updated"; exit 0; } || boot_download
 
+# Installing GRUB
 
-# Getting informations about the disks and where is the boot partition
-CONFIG_PATH='/opt/openslx/config'
-. $CONFIG_PATH
-
-echo " SLX_CHOOSEN_DISK $SLX_CHOOSEN_DISK" #Just for test
-
-        case $SLX_CHOOSEN_DISK in
-
-        sda) GRUB_DISK=hd0 ;;
-        sdb) GRUB_DISK=hd1 ;;
-        sdc) GRUB_DISK=hd2 ;;
-        sdd) GRUB_DISK=hd3 ;;
-        sde) GRUB_DISK=hd4 ;;
-	  *) echo "GRUB_DISK was not found"
-	     exit 1 ;;
-        esac
-
-echo "GRUB_DISK $GRUB_DISK" #Just for test
-
-
-        case $SLX_PARTITION_TYPE in
+#Find disk of /boot
+BOOT_DISK=$(df | grep /boot | awk '{print $1}' | tr -d '[0-9]')
+BOOT_PART=$(df | grep /boot | awk '{print $1}' | tr -dc '[0-9]')
+[ -z "$BOOT_DISK" ] && { echo "BOOT DISK could not be found, exiting.";  exit 1; }
 
-        GPT)	sgdisk -p /dev/$SLX_CHOOSEN_DISK | grep EF02 > /dev/null
-		[ $? != 0 ] && { echo "Could not find a BIOS boot partition "; exit 1; }
+if [ ! -d /boot/grub ]; then
+	# First, copy from etc
+	[ -d  /etc/grub ] ||  { echo "Could not find /grub directory"; exit 1; }
+	cp -r /etc/grub /boot/
 
-		SLX_BOOT_ID=$(sgdisk -p /dev/$SLX_CHOOSEN_DISK | grep /boot | cut -c1-6 | sed -e 's/^ *//' -e 's/ *$//' ) # <------- is it working ? remove both trailing and leading spaces with sed
-		echo " SLX_BOOT_ID $SLX_BOOT_ID" #Just for test
-		
-		SLX_BOOT_PARTITION=gpt$SLX_BOOT_ID
-		echo " SLX_BOOT_PARTITION $SLX_BOOT_PARTITION" # Just for test
+	grub-install --boot-directory=/boot $BOOT_DISK
+	RET=$?
+	[ $RET != 0 ] && { echo "Could not install GRUB";  exit 1; } ||  echo "GRUB successfully installed"
+fi
 
-	;;
-	MSDOS)
-		SLX_BOOT_ID=$(grep boot $CONFIG_PATH |cut -f1 | tr '#' '\n' | cut -d, -f1)
-		echo " SLX_BOOT_ID $SLX_BOOT_ID" #Just for test
+#GRUB ok, so lets make the menu
 
-		SLX_BOOT_PARTITION=msdos$(grep $SLX_BOOT_ID disk.partition | cut -c9)
-		echo " SLX_BOOT_PARTITION $SLX_BOOT_PARTITION" #Just for test
-	;;
-	esac
+echo " BOOT DISK is $BOOT_DISK" #Just for test
+case $BOOT_DISK in
+	/dev/sda) GRUB_DISK=hd0 ;;
+	/dev/sdb) GRUB_DISK=hd1 ;;
+	/dev/sdc) GRUB_DISK=hd2 ;;
+	/dev/sdd) GRUB_DISK=hd3 ;;
+	/dev/sde) GRUB_DISK=hd4 ;;
+	*) echo "GRUB_DISK was not found"
+		exit 1 ;;
+esac
 
-# Installing GRUB
-# First, copy from etc
-
- if [ ! -d /boot/grub ]; then
- 
- [ -d  /etc/grub ] ||  { echo "Could not find /grub directory"; exit 1; }
- cp -r /etc/grub /boot/
- cd /
- grub-install --boot-directory=/boot /dev/$SLX_CHOOSEN_DISK
- RET=$?
- [ $RET != 0 ] && { echo "Could not install GRUB";  exit 1; } ||  echo "GRUB successfully installed"
- fi
+echo "GRUB_DISK $GRUB_DISK" #Just for test
 
-#GRUB ok, so lets make the menu
+[ -e  /boot/grub/grub.cfg ] ||  { echo "Could not find grub.cfg"; exit 1; }
 
-cd /boot/grub/
-[ -e  grub.cfg ] ||  { echo "Could not find grub.cfg"; exit 1; }
-	
 cat <<EOF >> grub.cfg
 #########################
-        menuentry '$SLX_BASE_PATH' { 
-        linux ($GRUB_DISK,$SLX_BOOT_PARTITION)/$SLX_BASE_PATH/kernel  hdd_boot=$SLX_CHOOSEN_DISK$SLX_BOOT_ID $KCL 
-        initrd ($GRUB_DISK,$SLX_BOOT_PARTITION)/$SLX_BASE_PATH/initramfs-stage31
+	menuentry '$SLX_BASE_PATH' {
+	linux ($GRUB_DISK,msdos$BOOT_PART)/$SLX_BASE_PATH/kernel  hdd_boot=$BOOT_DISK$BOOT_PART $KCL
+	initrd ($GRUB_DISK,msdos$BOOT_PART)/$SLX_BASE_PATH/initramfs-stage31
 }
 #########################
 EOF
diff --git a/vim.log b/vim.log
new file mode 100644
index 00000000..735a9340
--- /dev/null
+++ b/vim.log
@@ -0,0 +1,282 @@
+
+chdir(/usr/share/vim)
+fchdir() to previous dir
+sourcing "$VIM/vimrc"
+Searching for "debian.vim" in "/home/michael/.vim,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/debian.vim"
+Searching for "/usr/share/vim/vimfiles/debian.vim"
+Searching for "/usr/share/vim/vim74/debian.vim"
+chdir(/usr/share/vim/vim74)
+fchdir() to previous dir
+line 10: sourcing "/usr/share/vim/vim74/debian.vim"
+finished sourcing /usr/share/vim/vim74/debian.vim
+continuing in /usr/share/vim/vimrc
+Searching for "/usr/share/vim/vimfiles/after/debian.vim"
+Searching for "/home/michael/.vim/after/debian.vim"
+chdir(/usr/share/vim/vim74/syntax)
+fchdir() to previous dir
+line 20: sourcing "/usr/share/vim/vim74/syntax/syntax.vim"
+Searching for "syntax/synload.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/syntax/synload.vim"
+Searching for "/var/lib/vim/addons/syntax/synload.vim"
+Searching for "/usr/share/vim/vimfiles/syntax/synload.vim"
+Searching for "/usr/share/vim/vim74/syntax/synload.vim"
+chdir(/usr/share/vim/vim74/syntax)
+fchdir() to previous dir
+line 19: sourcing "/usr/share/vim/vim74/syntax/synload.vim"
+Searching for "syntax/syncolor.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/syntax/syncolor.vim"
+Searching for "/var/lib/vim/addons/syntax/syncolor.vim"
+Searching for "/usr/share/vim/vimfiles/syntax/syncolor.vim"
+Searching for "/usr/share/vim/vim74/syntax/syncolor.vim"
+chdir(/usr/share/vim/vim74/syntax)
+fchdir() to previous dir
+line 21: sourcing "/usr/share/vim/vim74/syntax/syncolor.vim"
+finished sourcing /usr/share/vim/vim74/syntax/syncolor.vim
+continuing in /usr/share/vim/vim74/syntax/synload.vim
+Searching for "/usr/share/vim/vimfiles/after/syntax/syncolor.vim"
+Searching for "/var/lib/vim/addons/after/syntax/syncolor.vim"
+Searching for "/home/michael/.vim/after/syntax/syncolor.vim"
+finished sourcing /usr/share/vim/vim74/syntax/synload.vim
+continuing in /usr/share/vim/vim74/syntax/syntax.vim
+Searching for "filetype.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/filetype.vim"
+Searching for "/var/lib/vim/addons/filetype.vim"
+Searching for "/usr/share/vim/vimfiles/filetype.vim"
+Searching for "/usr/share/vim/vim74/filetype.vim"
+chdir(/usr/share/vim/vim74)
+fchdir() to previous dir
+line 25: sourcing "/usr/share/vim/vim74/filetype.vim"
+Searching for "ftdetect/*.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/ftdetect/*.vim"
+Searching for "/var/lib/vim/addons/ftdetect/*.vim"
+Searching for "/usr/share/vim/vimfiles/ftdetect/*.vim"
+Searching for "/usr/share/vim/vim74/ftdetect/*.vim"
+Searching for "/usr/share/vim/vimfiles/after/ftdetect/*.vim"
+Searching for "/var/lib/vim/addons/after/ftdetect/*.vim"
+Searching for "/home/michael/.vim/after/ftdetect/*.vim"
+not found in 'runtimepath': "ftdetect/*.vim"
+finished sourcing /usr/share/vim/vim74/filetype.vim
+continuing in /usr/share/vim/vim74/syntax/syntax.vim
+Searching for "/usr/share/vim/vimfiles/after/filetype.vim"
+Searching for "/var/lib/vim/addons/after/filetype.vim"
+Searching for "/home/michael/.vim/after/filetype.vim"
+finished sourcing /usr/share/vim/vim74/syntax/syntax.vim
+continuing in /usr/share/vim/vimrc
+finished sourcing $VIM/vimrc
+chdir(/home/michael)
+fchdir() to previous dir
+sourcing "$HOME/.vimrc"
+Searching for "syntax/syncolor.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/syntax/syncolor.vim"
+Searching for "/var/lib/vim/addons/syntax/syncolor.vim"
+Searching for "/usr/share/vim/vimfiles/syntax/syncolor.vim"
+Searching for "/usr/share/vim/vim74/syntax/syncolor.vim"
+chdir(/usr/share/vim/vim74/syntax)
+fchdir() to previous dir
+line 2: sourcing "/usr/share/vim/vim74/syntax/syncolor.vim"
+finished sourcing /usr/share/vim/vim74/syntax/syncolor.vim
+continuing in /home/michael/.vimrc
+Searching for "/usr/share/vim/vimfiles/after/syntax/syncolor.vim"
+Searching for "/var/lib/vim/addons/after/syntax/syncolor.vim"
+Searching for "/home/michael/.vim/after/syntax/syncolor.vim"
+Searching for "colors/xoria256.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/colors/xoria256.vim"
+chdir(/home/michael/.vim/colors)
+fchdir() to previous dir
+line 2: sourcing "/home/michael/.vim/colors/xoria256.vim"
+Searching for "syntax/syncolor.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/syntax/syncolor.vim"
+Searching for "/var/lib/vim/addons/syntax/syncolor.vim"
+Searching for "/usr/share/vim/vimfiles/syntax/syncolor.vim"
+Searching for "/usr/share/vim/vim74/syntax/syncolor.vim"
+chdir(/usr/share/vim/vim74/syntax)
+fchdir() to previous dir
+line 27: sourcing "/usr/share/vim/vim74/syntax/syncolor.vim"
+finished sourcing /usr/share/vim/vim74/syntax/syncolor.vim
+continuing in /home/michael/.vim/colors/xoria256.vim
+Searching for "/usr/share/vim/vimfiles/after/syntax/syncolor.vim"
+Searching for "/var/lib/vim/addons/after/syntax/syncolor.vim"
+Searching for "/home/michael/.vim/after/syntax/syncolor.vim"
+Searching for "syntax/syncolor.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/syntax/syncolor.vim"
+Searching for "/var/lib/vim/addons/syntax/syncolor.vim"
+Searching for "/usr/share/vim/vimfiles/syntax/syncolor.vim"
+Searching for "/usr/share/vim/vim74/syntax/syncolor.vim"
+chdir(/usr/share/vim/vim74/syntax)
+fchdir() to previous dir
+line 29: sourcing "/usr/share/vim/vim74/syntax/syncolor.vim"
+finished sourcing /usr/share/vim/vim74/syntax/syncolor.vim
+continuing in /home/michael/.vim/colors/xoria256.vim
+Searching for "/usr/share/vim/vimfiles/after/syntax/syncolor.vim"
+Searching for "/var/lib/vim/addons/after/syntax/syncolor.vim"
+Searching for "/home/michael/.vim/after/syntax/syncolor.vim"
+Searching for "syntax/syncolor.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/syntax/syncolor.vim"
+Searching for "/var/lib/vim/addons/syntax/syncolor.vim"
+Searching for "/usr/share/vim/vimfiles/syntax/syncolor.vim"
+Searching for "/usr/share/vim/vim74/syntax/syncolor.vim"
+chdir(/usr/share/vim/vim74/syntax)
+fchdir() to previous dir
+line 32: sourcing "/usr/share/vim/vim74/syntax/syncolor.vim"
+finished sourcing /usr/share/vim/vim74/syntax/syncolor.vim
+continuing in /home/michael/.vim/colors/xoria256.vim
+Searching for "/usr/share/vim/vimfiles/after/syntax/syncolor.vim"
+Searching for "/var/lib/vim/addons/after/syntax/syncolor.vim"
+Searching for "/home/michael/.vim/after/syntax/syncolor.vim"
+finished sourcing /home/michael/.vim/colors/xoria256.vim
+continuing in /home/michael/.vimrc
+chdir(/usr/share/vim/vim74/syntax)
+fchdir() to previous dir
+line 3: sourcing "/usr/share/vim/vim74/syntax/syntax.vim"
+chdir(/usr/share/vim/vim74/syntax)
+fchdir() to previous dir
+line 15: sourcing "/usr/share/vim/vim74/syntax/nosyntax.vim"
+finished sourcing /usr/share/vim/vim74/syntax/nosyntax.vim
+continuing in /usr/share/vim/vim74/syntax/syntax.vim
+Searching for "syntax/synload.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/syntax/synload.vim"
+Searching for "/var/lib/vim/addons/syntax/synload.vim"
+Searching for "/usr/share/vim/vimfiles/syntax/synload.vim"
+Searching for "/usr/share/vim/vim74/syntax/synload.vim"
+chdir(/usr/share/vim/vim74/syntax)
+fchdir() to previous dir
+line 19: sourcing "/usr/share/vim/vim74/syntax/synload.vim"
+Searching for "colors/xoria256.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/colors/xoria256.vim"
+chdir(/home/michael/.vim/colors)
+fchdir() to previous dir
+line 19: sourcing "/home/michael/.vim/colors/xoria256.vim"
+Searching for "syntax/syncolor.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/syntax/syncolor.vim"
+Searching for "/var/lib/vim/addons/syntax/syncolor.vim"
+Searching for "/usr/share/vim/vimfiles/syntax/syncolor.vim"
+Searching for "/usr/share/vim/vim74/syntax/syncolor.vim"
+chdir(/usr/share/vim/vim74/syntax)
+fchdir() to previous dir
+line 29: sourcing "/usr/share/vim/vim74/syntax/syncolor.vim"
+finished sourcing /usr/share/vim/vim74/syntax/syncolor.vim
+continuing in /home/michael/.vim/colors/xoria256.vim
+Searching for "/usr/share/vim/vimfiles/after/syntax/syncolor.vim"
+Searching for "/var/lib/vim/addons/after/syntax/syncolor.vim"
+Searching for "/home/michael/.vim/after/syntax/syncolor.vim"
+Searching for "syntax/syncolor.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/syntax/syncolor.vim"
+Searching for "/var/lib/vim/addons/syntax/syncolor.vim"
+Searching for "/usr/share/vim/vimfiles/syntax/syncolor.vim"
+Searching for "/usr/share/vim/vim74/syntax/syncolor.vim"
+chdir(/usr/share/vim/vim74/syntax)
+fchdir() to previous dir
+line 32: sourcing "/usr/share/vim/vim74/syntax/syncolor.vim"
+finished sourcing /usr/share/vim/vim74/syntax/syncolor.vim
+continuing in /home/michael/.vim/colors/xoria256.vim
+Searching for "/usr/share/vim/vimfiles/after/syntax/syncolor.vim"
+Searching for "/var/lib/vim/addons/after/syntax/syncolor.vim"
+Searching for "/home/michael/.vim/after/syntax/syncolor.vim"
+finished sourcing /home/michael/.vim/colors/xoria256.vim
+continuing in /usr/share/vim/vim74/syntax/synload.vim
+finished sourcing /usr/share/vim/vim74/syntax/synload.vim
+continuing in /usr/share/vim/vim74/syntax/syntax.vim
+finished sourcing /usr/share/vim/vim74/syntax/syntax.vim
+continuing in /home/michael/.vimrc
+finished sourcing $HOME/.vimrc
+Searching for "plugin/**/*.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/plugin/**/*.vim"
+chdir(/home/michael/.vim/plugin)
+fchdir() to previous dir
+sourcing "/home/michael/.vim/plugin/detectindent.vim"
+finished sourcing /home/michael/.vim/plugin/detectindent.vim
+Searching for "/var/lib/vim/addons/plugin/**/*.vim"
+Searching for "/usr/share/vim/vimfiles/plugin/**/*.vim"
+Searching for "/usr/share/vim/vim74/plugin/**/*.vim"
+chdir(/usr/share/vim/vim74/plugin)
+fchdir() to previous dir
+sourcing "/usr/share/vim/vim74/plugin/getscriptPlugin.vim"
+finished sourcing /usr/share/vim/vim74/plugin/getscriptPlugin.vim
+chdir(/usr/share/vim/vim74/plugin)
+fchdir() to previous dir
+sourcing "/usr/share/vim/vim74/plugin/gzip.vim"
+finished sourcing /usr/share/vim/vim74/plugin/gzip.vim
+chdir(/usr/share/vim/vim74/plugin)
+fchdir() to previous dir
+sourcing "/usr/share/vim/vim74/plugin/matchparen.vim"
+finished sourcing /usr/share/vim/vim74/plugin/matchparen.vim
+chdir(/usr/share/vim/vim74/plugin)
+fchdir() to previous dir
+sourcing "/usr/share/vim/vim74/plugin/netrwPlugin.vim"
+finished sourcing /usr/share/vim/vim74/plugin/netrwPlugin.vim
+chdir(/usr/share/vim/vim74/plugin)
+fchdir() to previous dir
+sourcing "/usr/share/vim/vim74/plugin/rrhelper.vim"
+finished sourcing /usr/share/vim/vim74/plugin/rrhelper.vim
+chdir(/usr/share/vim/vim74/plugin)
+fchdir() to previous dir
+sourcing "/usr/share/vim/vim74/plugin/spellfile.vim"
+finished sourcing /usr/share/vim/vim74/plugin/spellfile.vim
+chdir(/usr/share/vim/vim74/plugin)
+fchdir() to previous dir
+sourcing "/usr/share/vim/vim74/plugin/tarPlugin.vim"
+finished sourcing /usr/share/vim/vim74/plugin/tarPlugin.vim
+chdir(/usr/share/vim/vim74/plugin)
+fchdir() to previous dir
+sourcing "/usr/share/vim/vim74/plugin/tohtml.vim"
+finished sourcing /usr/share/vim/vim74/plugin/tohtml.vim
+chdir(/usr/share/vim/vim74/plugin)
+fchdir() to previous dir
+sourcing "/usr/share/vim/vim74/plugin/vimballPlugin.vim"
+finished sourcing /usr/share/vim/vim74/plugin/vimballPlugin.vim
+chdir(/usr/share/vim/vim74/plugin)
+fchdir() to previous dir
+sourcing "/usr/share/vim/vim74/plugin/zipPlugin.vim"
+finished sourcing /usr/share/vim/vim74/plugin/zipPlugin.vim
+Searching for "/usr/share/vim/vimfiles/after/plugin/**/*.vim"
+Searching for "/var/lib/vim/addons/after/plugin/**/*.vim"
+Searching for "/home/michael/.vim/after/plugin/**/*.vim"
+Reading viminfo file "/home/michael/.viminfo" info oldfiles
+chdir(/home/michael/tm-scripts)
+fchdir() to previous dir
+                        "vim.log" 
+"vim.log" [noeol] 206L, 12288C
+Reading viminfo file "/home/michael/.viminfo" marks
+Searching for "scripts.vim" in "/home/michael/.vim,/var/lib/vim/addons,/usr/share/vim/vimfiles,/usr/share/vim/vim74,/usr/share/vim/vimfiles/after,/var/lib/vim/addons/after,/home/michael/.vim/after"
+Searching for "/home/michael/.vim/scripts.vim"
+chdir(/home/michael/.vim)
+fchdir() to previous dir
+line 0: sourcing "/home/michael/.vim/scripts.vim"
+finished sourcing /home/michael/.vim/scripts.vim
+continuing in BufRead Auto commands for "*"
+Searching for "/var/lib/vim/addons/scripts.vim"
+Searching for "/usr/share/vim/vimfiles/scripts.vim"
+Searching for "/usr/share/vim/vim74/scripts.vim"
+chdir(/usr/share/vim/vim74)
+fchdir() to previous dir
+line 0: sourcing "/usr/share/vim/vim74/scripts.vim"
+finished sourcing /usr/share/vim/vim74/scripts.vim
+continuing in BufRead Auto commands for "*"
+Searching for "/usr/share/vim/vimfiles/after/scripts.vim"
+Searching for "/var/lib/vim/addons/after/scripts.vim"
+Searching for "/home/michael/.vim/after/scripts.vim"
+; leading_tabs_num: 0, leading_spaces_num: 0, leading_spaces 1: 0, leading_spaces 2: 0, leading_spaces 3: 0, leading_spaces 4: 0, leading_spaces 5: 0, leading_spaces 6: 0, leading_spaces 7: 0, leading_spaces 8: 0
+/.vimrc
+
+/.vimrc
+
+/.vimrc
+
+/.vimrc
+
+/.vimrc
+
+/.vimrc
+
+/.vimrc
+
+/.vimrc
+
+/.vimrc
+-- INSERT --
+
+
+E492: Not an editor command: Q!
+
+Writing viminfo file "/home/michael/.viminfo"
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 9e07f5c6229556a5f17b5f0a550b0c9724b44919 Mon Sep 17 00:00:00 2001
From: Michael Pereira
Date: Mon, 2 Mar 2015 02:45:28 +0100
Subject: [hdd-boot] addons are now loaded from hdd and vm xml files copied to
 /boot

---
 .../opt/openslx/scripts/systemd-setup_slx_addons   | 21 ++++++++++++++------
 .../hdd-boot/opt/openslx/scripts/systemd-hdd_boot  | 23 ++++++++++++++++++++--
 2 files changed, 36 insertions(+), 8 deletions(-)

(limited to 'server/modules')

diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
index 8d4d2d1a..71ed70a7 100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons
@@ -14,7 +14,7 @@
 #
 #
 ######################################################################################
-
+set -x
 # read global OpenSLX config
 . /opt/openslx/config || { echo "Could not source config!"; exit 23; }
 
@@ -35,6 +35,9 @@ BASE_MOUNT_POINT="/opt/openslx/mnt"
 DOWNLOAD_DEST="/tmp/addons"
 mkdir -p "$DOWNLOAD_DEST" || { echo "Failed to create $DOWNLOAD_DEST"; exit 1; }
 
+# Check if HDD Boot is active
+if grep -qs 'hdd_boot' /proc/cmdline; then HDD="yes"; fi
+
 ######################################################################################
 #
 #				NO ARGUMENTS -> LOOP OVER ALL ADDONS
@@ -54,13 +57,19 @@ fi
 
 if [ $# -eq 1 ]; then
 	ADDON="$1"
-
-	# download the addon from the given URL
 	ADDON_TARGET_PATH="${DOWNLOAD_DEST}/$(basename "$ADDON").sqfs"
-	if ! download "${SLX_BASE_PATH}/${ADDON}.sqfs" "${ADDON_TARGET_PATH}"; then
-		slxlog --echo "addon-download" "Download of '${HTTP_BASE_PATH}/${ADDON}.sqfs' failed."
-		exit 1
+
+	if [ -z "$HDD" ]; then
+		# download the addon from the given URL
+		if ! download "${SLX_BASE_PATH}/${ADDON}.sqfs" "${ADDON_TARGET_PATH}"; then
+			slxlog --echo "addon-download" "Download of '${HTTP_BASE_PATH}/${ADDON}.sqfs' failed."
+			exit 1
+		fi
+	else
+		# copy from /boot
+		cp /boot/${SLX_BASE_PATH}/${ADDON}.sqfs ${ADDON_TARGET_PATH} 	
 	fi
+	
 
 	# now mount it to $BASE_MOUNT_POINT/<addon-name>
 	ADDON_MOUNT_POINT="${BASE_MOUNT_POINT}/$(basename "$ADDON")"
diff --git a/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot b/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot
index 3696dc7b..5e255d46 100755
--- a/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot
+++ b/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -x
 
 # Downloading all in SLX_BASE_PATH to  /boot  Example: Ubuntu_1404_x64
 # wget -N,  update if the file has been changed
@@ -26,6 +27,24 @@ for opts in ${KCL}; do
 done
 KCL=$(echo "$KCL" | sed "s|SLX_BASE_PATH|$SLX_BASE_PATH|g;s|$BOOT_IMAGE||g;s|$initrd||g")
 
+# Scan vm-store dir for vmware image xmls and copy  
+if [ -d /cache/export/dnbd3 -a -d /mnt/vmstore ]; then
+	[ ! -d /boot/vmstore ] && mkdir /boot/vmstore
+	for FILE in $(find /cache/export/dnbd3 -iname "*.vmdk*" ! -iname "*map"); do
+		[ -e "${FILE}.map" ] && continue
+		image_name=$(echo $(basename "$FILE") | cut -d "." -f1)
+		for XML in $(grep -rIl --include "*.xml" "$image_name" /mnt/vmstore); do
+			cp $XML /boot/vmstore
+		done
+	done
+fi
+
+# Bind mount available vmstore in /boot to /mnt/vmstore if not already present
+if ! grep -qs '/mnt/vmstore' /proc/mounts; then
+	[ ! -d /mnt/vmstore ] && mkdir -p /mnt/vmstore
+	[ -d /boot/vmstore ] && mount --bind /boot/vmstore /mnt/vmstore
+fi
+
 # if SLX_BASE_PATH already exists, just update. Does not make the menu again.
 [ -d  /boot/$SLX_BASE_PATH ] && { boot_download; echo "$SLX_BASE_PATH updated"; exit 0; } || boot_download
 
@@ -63,10 +82,10 @@ echo "GRUB_DISK $GRUB_DISK" #Just for test
 
 [ -e  /boot/grub/grub.cfg ] ||  { echo "Could not find grub.cfg"; exit 1; }
 
-cat <<EOF >> grub.cfg
+cat <<EOF >> /boot/grub/grub.cfg
 #########################
 	menuentry '$SLX_BASE_PATH' {
-	linux ($GRUB_DISK,msdos$BOOT_PART)/$SLX_BASE_PATH/kernel  hdd_boot=$BOOT_DISK$BOOT_PART $KCL
+	linux ($GRUB_DISK,msdos$BOOT_PART)/$SLX_BASE_PATH/kernel  hdd_boot=$BOOT_PART $KCL
 	initrd ($GRUB_DISK,msdos$BOOT_PART)/$SLX_BASE_PATH/initramfs-stage31
 }
 #########################
-- 
cgit v1.2.3-55-g7522


From 9b3a912bee0a172f31a72c365c1e1faea2dc20e4 Mon Sep 17 00:00:00 2001
From: Michael Pereira
Date: Thu, 5 Mar 2015 14:30:14 +0100
Subject: [hdd-boot] some fixes and cleanup

---
 remote/modules/grub/data/etc/grub/gfxblacklist.txt |  19 --
 remote/modules/grub/data/etc/grub/grub.cfg         | 192 ---------------
 .../modules/grub/data/etc/grub/grub.default.style  |  27 ---
 remote/modules/grub/data/etc/grub/grubenv          |   2 -
 .../grub/data/etc/grub/i386-pc/915resolution.mod   | Bin 7980 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/acpi.mod | Bin 9952 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/adler32.mod | Bin 1312 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/affs.mod | Bin 5768 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/afs.mod  | Bin 6668 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ahci.mod | Bin 15408 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/all_video.mod       | Bin 701 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/aout.mod | Bin 1048 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/archelp.mod | Bin 2940 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/at_keyboard.mod     | Bin 4248 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ata.mod  | Bin 5652 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/backtrace.mod       | Bin 1632 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/bfs.mod  | Bin 7252 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/biosdisk.mod        | Bin 4660 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/bitmap.mod  | Bin 2244 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/bitmap_scale.mod    | Bin 3636 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/blocklist.mod       | Bin 2152 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/boot.img | Bin 512 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/boot.mod | Bin 2456 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/bsd.mod  | Bin 30072 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/btrfs.mod   | Bin 14452 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/bufio.mod   | Bin 2108 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/cat.mod  | Bin 2876 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/cbfs.mod | Bin 3744 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/cbls.mod | Bin 3584 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/cbmemc.mod  | Bin 2384 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/cbtable.mod | Bin 1072 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/cbtime.mod  | Bin 2556 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/chain.mod   | Bin 3504 -> 0 bytes
 .../data/etc/grub/i386-pc/cmdline_cat_test.mod     | Bin 3040 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/cmosdump.mod        | Bin 1216 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/cmostest.mod        | Bin 1836 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/cmp.mod  | Bin 1984 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/command.lst | 199 ----------------
 .../grub/data/etc/grub/i386-pc/configfile.mod      | Bin 2264 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/core.img | Bin 25568 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/cpio.mod | Bin 2644 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/cpio_be.mod | Bin 2744 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/cpuid.mod   | Bin 1720 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/crc64.mod   | Bin 1672 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/crypto.lst  |  45 ----
 .../modules/grub/data/etc/grub/i386-pc/crypto.mod  | Bin 4916 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/cryptodisk.mod      | Bin 10032 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/cs5536.mod  | Bin 3904 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/date.mod | Bin 2172 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/datehook.mod        | Bin 1788 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/datetime.mod        | Bin 1269 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/disk.mod | Bin 2380 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/diskfilter.mod      | Bin 9764 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/div_test.mod        | Bin 3848 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/dm_nv.mod   | Bin 1828 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/drivemap.mod        | Bin 5404 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/echo.mod | Bin 1984 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/efiemu.mod  | Bin 23960 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/efiemu32.o  | Bin 7424 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/efiemu64.o  | Bin 11313 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ehci.mod | Bin 15972 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/elf.mod  | Bin 5116 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/eval.mod | Bin 1436 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/exfat.mod   | Bin 5508 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/exfctest.mod        | Bin 1468 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ext2.mod | Bin 5608 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/extcmd.mod  | Bin 4512 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/fat.mod  | Bin 5628 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/file.mod | Bin 16084 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/font.mod | Bin 12472 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/freedos.mod | Bin 2664 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/fs.lst   |  36 ---
 .../modules/grub/data/etc/grub/i386-pc/fshelp.mod  | Bin 2568 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/functional_test.mod | Bin 89748 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_arcfour.mod    | Bin 1612 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_blowfish.mod   | Bin 8096 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_camellia.mod   | Bin 34124 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_cast5.mod      | Bin 16836 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_crc.mod        | Bin 2912 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_des.mod        | Bin 19308 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_dsa.mod        | Bin 2264 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_idea.mod       | Bin 2976 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_md4.mod        | Bin 3124 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_md5.mod        | Bin 3760 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_rfc2268.mod    | Bin 2496 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_rijndael.mod   | Bin 19076 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_rmd160.mod     | Bin 8108 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_rsa.mod        | Bin 2068 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_seed.mod       | Bin 15636 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_serpent.mod    | Bin 16124 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_sha1.mod       | Bin 7460 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_sha256.mod     | Bin 4348 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_sha512.mod     | Bin 7988 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_tiger.mod      | Bin 12536 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_twofish.mod    | Bin 39376 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gcry_whirlpool.mod  | Bin 24688 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/gdb.mod  | Bin 25228 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/geli.mod | Bin 5848 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/gettext.mod | Bin 4964 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/gfxmenu.mod | Bin 39256 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/gfxterm.mod | Bin 9952 -> 0 bytes
 .../data/etc/grub/i386-pc/gfxterm_background.mod   | Bin 2864 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/gfxterm_menu.mod    | Bin 5032 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/gptsync.mod | Bin 3764 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/gzio.mod | Bin 8224 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/halt.mod | Bin 4336 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/hashsum.mod | Bin 5216 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/hdparm.mod  | Bin 7208 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/hello.mod   | Bin 1204 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/help.mod | Bin 2576 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/hexdump.mod | Bin 3168 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/hfs.mod  | Bin 7144 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/hfsplus.mod | Bin 7576 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/hfspluscomp.mod     | Bin 2956 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/http.mod | Bin 5564 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/hwmatch.mod | Bin 47288 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/iorw.mod | Bin 2836 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/iso9660.mod | Bin 8616 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/jfs.mod  | Bin 6176 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/jpeg.mod | Bin 6236 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/keylayouts.mod      | Bin 5004 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/keystatus.mod       | Bin 1948 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ldm.mod  | Bin 6864 -> 0 bytes
 .../data/etc/grub/i386-pc/legacy_password_test.mod | Bin 14480 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/legacycfg.mod       | Bin 29856 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/linux.mod   | Bin 13076 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/linux16.mod | Bin 7920 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/loadenv.mod | Bin 5988 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/loopback.mod        | Bin 2984 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ls.mod   | Bin 4052 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/lsacpi.mod  | Bin 4788 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/lsapm.mod   | Bin 2280 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/lsmmap.mod  | Bin 1780 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/lspci.mod   | Bin 4824 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/luks.mod | Bin 6660 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/lvm.mod  | Bin 6768 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/lzopio.mod  | Bin 8668 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/macbless.mod        | Bin 3308 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/macho.mod   | Bin 7516 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/mda_text.mod        | Bin 2036 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/mdraid09.mod        | Bin 1960 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/mdraid09_be.mod     | Bin 2040 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/mdraid1x.mod        | Bin 1968 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/memdisk.mod | Bin 2004 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/memrw.mod   | Bin 2836 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/minicmd.mod | Bin 3436 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/minix.mod   | Bin 3504 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/minix2.mod  | Bin 3568 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/minix2_be.mod       | Bin 3732 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/minix3.mod  | Bin 3536 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/minix3_be.mod       | Bin 3704 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/minix_be.mod        | Bin 3636 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/mmap.mod | Bin 8504 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/moddep.lst  | 259 ---------------------
 .../modules/grub/data/etc/grub/i386-pc/modinfo.sh  |  36 ---
 .../modules/grub/data/etc/grub/i386-pc/morse.mod   | Bin 2368 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/mpi.mod  | Bin 27840 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/msdospart.mod       | Bin 2396 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/multiboot.mod       | Bin 12876 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/multiboot2.mod      | Bin 13284 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/nativedisk.mod      | Bin 4064 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/net.mod  | Bin 46628 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/newc.mod | Bin 2916 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/nilfs2.mod  | Bin 6732 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/normal.mod  | Bin 115868 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ntfs.mod | Bin 9920 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/ntfscomp.mod        | Bin 4324 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/ntldr.mod   | Bin 2556 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/odc.mod  | Bin 2728 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/offsetio.mod        | Bin 1508 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ohci.mod | Bin 10540 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/part_acorn.mod      | Bin 1668 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/part_amiga.mod      | Bin 1860 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/part_apple.mod      | Bin 2112 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/part_bsd.mod        | Bin 2752 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/part_dfly.mod       | Bin 1732 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/part_dvh.mod        | Bin 1480 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/part_gpt.mod        | Bin 2372 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/part_msdos.mod      | Bin 2344 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/part_plan.mod       | Bin 1800 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/part_sun.mod        | Bin 1524 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/part_sunpc.mod      | Bin 1620 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/partmap.lst |  11 -
 .../grub/data/etc/grub/i386-pc/parttool.lst        |   1 -
 .../grub/data/etc/grub/i386-pc/parttool.mod        | Bin 4620 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/password.mod        | Bin 1896 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/password_pbkdf2.mod | Bin 2800 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/pata.mod | Bin 4792 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/pbkdf2.mod  | Bin 1460 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/pbkdf2_test.mod     | Bin 2224 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/pci.mod  | Bin 1396 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/pcidump.mod | Bin 2460 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/plan9.mod   | Bin 6208 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/play.mod | Bin 2424 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/png.mod  | Bin 7392 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/priority_queue.mod  | Bin 1556 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/probe.mod   | Bin 2680 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/procfs.mod  | Bin 2112 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/progress.mod        | Bin 2064 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/pxe.mod  | Bin 3824 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/pxechain.mod        | Bin 2668 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/raid5rec.mod        | Bin 1404 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/raid6rec.mod        | Bin 2188 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/read.mod | Bin 1448 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/reboot.mod  | Bin 1716 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/regexp.mod  | Bin 51176 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/reiserfs.mod        | Bin 8944 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/relocator.mod       | Bin 14936 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/romfs.mod   | Bin 4196 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/scsi.mod | Bin 4972 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/search.mod  | Bin 3664 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/search_fs_file.mod  | Bin 3236 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/search_fs_uuid.mod  | Bin 3196 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/search_label.mod    | Bin 3140 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/sendkey.mod | Bin 7080 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/serial.mod  | Bin 7756 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/setjmp.mod  | Bin 706 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/setjmp_test.mod     | Bin 1700 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/setpci.mod  | Bin 5388 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/sfs.mod  | Bin 5144 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/signature_test.mod  | Bin 6408 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/sleep.mod   | Bin 2272 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/sleep_test.mod      | Bin 2316 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/spkmodem.mod        | Bin 2080 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/squash4.mod | Bin 6872 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/syslinuxcfg.mod     | Bin 17460 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/tar.mod  | Bin 3348 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/terminal.lst        |  11 -
 .../grub/data/etc/grub/i386-pc/terminal.mod        | Bin 4464 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/terminfo.mod        | Bin 11636 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/test.mod | Bin 5128 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/test_blockarg.mod   | Bin 1340 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/testload.mod        | Bin 2712 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/testspeed.mod       | Bin 2308 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/tftp.mod | Bin 5288 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/tga.mod  | Bin 4448 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/time.mod | Bin 1508 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/tr.mod   | Bin 2388 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/trig.mod | Bin 1755 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/true.mod | Bin 1204 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/truecrypt.mod       | Bin 3544 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/udf.mod  | Bin 7776 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ufs1.mod | Bin 5476 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/ufs1_be.mod | Bin 5932 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/ufs2.mod | Bin 5536 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/uhci.mod | Bin 6668 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/usb.mod  | Bin 10716 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/usb_keyboard.mod    | Bin 3924 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/usbms.mod   | Bin 7064 -> 0 bytes
 .../data/etc/grub/i386-pc/usbserial_common.mod     | Bin 2064 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/usbserial_ftdi.mod  | Bin 2348 -> 0 bytes
 .../data/etc/grub/i386-pc/usbserial_pl2303.mod     | Bin 2692 -> 0 bytes
 .../data/etc/grub/i386-pc/usbserial_usbdebug.mod   | Bin 1536 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/usbtest.mod | Bin 3608 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/vbe.mod  | Bin 9900 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/verify.mod  | Bin 11664 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/vga.mod  | Bin 5028 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/vga_text.mod        | Bin 2148 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/video.lst   |   4 -
 .../modules/grub/data/etc/grub/i386-pc/video.mod   | Bin 6176 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/video_bochs.mod     | Bin 5700 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/video_cirrus.mod    | Bin 6048 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/video_colors.mod    | Bin 5684 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/video_fb.mod        | Bin 23372 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/videoinfo.mod       | Bin 3972 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/videotest.mod       | Bin 4248 -> 0 bytes
 .../data/etc/grub/i386-pc/videotest_checksum.mod   | Bin 2396 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/xfs.mod  | Bin 6168 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/xnu.mod  | Bin 27336 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/xnu_uuid.mod        | Bin 2144 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/xnu_uuid_test.mod   | Bin 2012 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/xzio.mod | Bin 15840 -> 0 bytes
 remote/modules/grub/data/etc/grub/i386-pc/zfs.mod  | Bin 39472 -> 0 bytes
 .../grub/data/etc/grub/i386-pc/zfscrypt.mod        | Bin 5472 -> 0 bytes
 .../modules/grub/data/etc/grub/i386-pc/zfsinfo.mod | Bin 6600 -> 0 bytes
 remote/modules/grub/data/etc/grub/locale/en_AU.mo  | Bin 942 -> 0 bytes
 remote/modules/grub/data/etc/grub/locale/en_CA.mo  | Bin 466 -> 0 bytes
 remote/modules/grub/data/etc/grub/locale/en_GB.mo  | Bin 4377 -> 0 bytes
 remote/modules/grub/data/etc/grub/locale/pt.mo     | Bin 33421 -> 0 bytes
 remote/modules/grub/data/etc/grub/locale/pt_BR.mo  | Bin 101546 -> 0 bytes
 remote/modules/grub/data/etc/grub/unicode.pf2      | Bin 2405285 -> 0 bytes
 remote/rootfs/rootfs-stage31/data/init             |   6 +-
 .../modules/hdd-boot/opt/openslx/hdd-boot/grub.cfg | 146 ++++++++++++
 .../hdd-boot/opt/openslx/scripts/systemd-hdd_boot  |  26 ++-
 284 files changed, 167 insertions(+), 853 deletions(-)
 delete mode 100644 remote/modules/grub/data/etc/grub/gfxblacklist.txt
 delete mode 100644 remote/modules/grub/data/etc/grub/grub.cfg
 delete mode 100644 remote/modules/grub/data/etc/grub/grub.default.style
 delete mode 100644 remote/modules/grub/data/etc/grub/grubenv
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/915resolution.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/acpi.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/adler32.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/affs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/afs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ahci.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/all_video.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/aout.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/archelp.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/at_keyboard.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ata.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/backtrace.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/bfs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/biosdisk.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/bitmap.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/bitmap_scale.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/blocklist.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/boot.img
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/boot.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/bsd.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/btrfs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/bufio.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cat.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cbfs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cbls.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cbmemc.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cbtable.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cbtime.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/chain.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cmdline_cat_test.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cmosdump.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cmostest.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cmp.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/command.lst
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/configfile.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/core.img
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cpio.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cpio_be.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cpuid.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/crc64.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/crypto.lst
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/crypto.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cryptodisk.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/cs5536.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/date.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/datehook.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/datetime.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/disk.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/diskfilter.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/div_test.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/dm_nv.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/drivemap.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/echo.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/efiemu.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/efiemu32.o
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/efiemu64.o
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ehci.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/elf.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/eval.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/exfat.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/exfctest.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ext2.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/extcmd.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/fat.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/file.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/font.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/freedos.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/fs.lst
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/fshelp.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/functional_test.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_arcfour.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_blowfish.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_camellia.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_cast5.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_crc.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_des.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_dsa.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_idea.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_md4.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_md5.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_rfc2268.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_rijndael.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_rmd160.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_rsa.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_seed.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_serpent.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_sha1.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_sha256.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_sha512.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_tiger.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_twofish.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gcry_whirlpool.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gdb.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/geli.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gettext.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gfxmenu.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gfxterm.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gfxterm_background.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gfxterm_menu.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gptsync.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/gzio.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/halt.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hashsum.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hdparm.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hello.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/help.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hexdump.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hfs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hfsplus.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hfspluscomp.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/http.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/hwmatch.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/iorw.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/iso9660.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/jfs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/jpeg.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/keylayouts.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/keystatus.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ldm.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/legacy_password_test.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/legacycfg.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/linux.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/linux16.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/loadenv.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/loopback.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ls.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/lsacpi.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/lsapm.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/lsmmap.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/lspci.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/luks.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/lvm.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/lzopio.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/macbless.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/macho.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/mda_text.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/mdraid09.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/mdraid09_be.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/mdraid1x.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/memdisk.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/memrw.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/minicmd.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/minix.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/minix2.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/minix2_be.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/minix3.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/minix3_be.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/minix_be.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/mmap.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/moddep.lst
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/modinfo.sh
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/morse.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/mpi.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/msdospart.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/multiboot.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/multiboot2.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/nativedisk.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/net.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/newc.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/nilfs2.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/normal.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ntfs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ntfscomp.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ntldr.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/odc.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/offsetio.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ohci.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_acorn.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_amiga.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_apple.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_bsd.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_dfly.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_dvh.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_gpt.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_msdos.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_plan.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_sun.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/part_sunpc.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/partmap.lst
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/parttool.lst
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/parttool.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/password.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/password_pbkdf2.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/pata.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/pbkdf2.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/pbkdf2_test.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/pci.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/pcidump.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/plan9.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/play.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/png.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/priority_queue.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/probe.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/procfs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/progress.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/pxe.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/pxechain.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/raid5rec.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/raid6rec.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/read.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/reboot.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/regexp.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/reiserfs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/relocator.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/romfs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/scsi.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/search.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/search_fs_file.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/search_fs_uuid.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/search_label.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/sendkey.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/serial.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/setjmp.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/setjmp_test.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/setpci.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/sfs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/signature_test.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/sleep.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/sleep_test.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/spkmodem.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/squash4.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/syslinuxcfg.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/tar.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/terminal.lst
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/terminal.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/terminfo.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/test.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/test_blockarg.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/testload.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/testspeed.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/tftp.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/tga.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/time.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/tr.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/trig.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/true.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/truecrypt.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/udf.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ufs1.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ufs1_be.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/ufs2.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/uhci.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usb.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usb_keyboard.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usbms.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usbserial_common.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usbserial_ftdi.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usbserial_pl2303.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usbserial_usbdebug.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/usbtest.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/vbe.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/verify.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/vga.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/vga_text.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/video.lst
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/video.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/video_bochs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/video_cirrus.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/video_colors.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/video_fb.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/videoinfo.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/videotest.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/videotest_checksum.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/xfs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/xnu.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid_test.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/xzio.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/zfs.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/zfscrypt.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/i386-pc/zfsinfo.mod
 delete mode 100644 remote/modules/grub/data/etc/grub/locale/en_AU.mo
 delete mode 100644 remote/modules/grub/data/etc/grub/locale/en_CA.mo
 delete mode 100644 remote/modules/grub/data/etc/grub/locale/en_GB.mo
 delete mode 100644 remote/modules/grub/data/etc/grub/locale/pt.mo
 delete mode 100644 remote/modules/grub/data/etc/grub/locale/pt_BR.mo
 delete mode 100644 remote/modules/grub/data/etc/grub/unicode.pf2
 create mode 100644 server/modules/hdd-boot/opt/openslx/hdd-boot/grub.cfg

(limited to 'server/modules')

diff --git a/remote/modules/grub/data/etc/grub/gfxblacklist.txt b/remote/modules/grub/data/etc/grub/gfxblacklist.txt
deleted file mode 100644
index 9e91caa9..00000000
--- a/remote/modules/grub/data/etc/grub/gfxblacklist.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# GRUB gfxpayload blacklist.  The format is a sequence of lines of the
-# following form, using lower-case hexadecimal for all ID components:
-#
-#   vVENDORdDEVICEsvSUBVENDORsdSUBDEVICEbcBASECLASSscSUBCLASS
-#
-# Blacklist lines are regex-matched (currently using Lua's string.find with
-# the line surrounded by ^ and $) against a corresponding PCI ID string.  In
-# practice this means that you can replace any part of the ID string with .*
-# to match anything.
-#
-# There is no need to customise this file locally.  If you need to disable
-# gfxpayload=keep on your system, just add this line (uncommented) to
-# /etc/default/grub:
-#
-#   GRUB_GFXPAYLOAD_LINUX=text
-
-v15add0710.*
-v15add0405.*
-v1002d6738.*
diff --git a/remote/modules/grub/data/etc/grub/grub.cfg b/remote/modules/grub/data/etc/grub/grub.cfg
deleted file mode 100644
index 7654d3b2..00000000
--- a/remote/modules/grub/data/etc/grub/grub.cfg
+++ /dev/null
@@ -1,192 +0,0 @@
-#
-# DO NOT EDIT THIS FILE
-#
-# It is automatically generated by grub-mkconfig using templates
-# from /etc/grub.d and settings from /etc/default/grub
-#
-
-### BEGIN /etc/grub.d/00_header ###
-if [ -s $prefix/grubenv ]; then
-  set have_grubenv=true
-  load_env
-fi
-if [ "${next_entry}" ] ; then
-   set default="${next_entry}"
-   set next_entry=
-   save_env next_entry
-   set boot_once=true
-else
-   set default="0"
-fi
-
-if [ x"${feature_menuentry_id}" = xy ]; then
-  menuentry_id_option="--id"
-else
-  menuentry_id_option=""
-fi
-
-export menuentry_id_option
-
-if [ "${prev_saved_entry}" ]; then
-  set saved_entry="${prev_saved_entry}"
-  save_env saved_entry
-  set prev_saved_entry=
-  save_env prev_saved_entry
-  set boot_once=true
-fi
-
-function savedefault {
-  if [ -z "${boot_once}" ]; then
-    saved_entry="${chosen}"
-    save_env saved_entry
-  fi
-}
-function recordfail {
-  set recordfail=1
-  if [ -n "${have_grubenv}" ]; then if [ -z "${boot_once}" ]; then save_env recordfail; fi; fi
-}
-function load_video {
-  if [ x$feature_all_video_module = xy ]; then
-    insmod all_video
-  else
-    insmod efi_gop
-    insmod efi_uga
-    insmod ieee1275_fb
-    insmod vbe
-    insmod vga
-    insmod video_bochs
-    insmod video_cirrus
-  fi
-}
-
-if [ x$feature_default_font_path = xy ] ; then
-   font=unicode
-else
-insmod part_msdos
-insmod lvm
-insmod ext2
-set root='lvmid/ZvOK2H-W5xA-QoO2-zy2n-Sjr7-cpu8-M3zL6F/FzLrNP-IhMk-pB8d-vEEW-Jxxk-ujc7-NWSegg'
-if [ x$feature_platform_search_hint = xy ]; then
-  search --no-floppy --fs-uuid --set=root --hint='lvmid/ZvOK2H-W5xA-QoO2-zy2n-Sjr7-cpu8-M3zL6F/FzLrNP-IhMk-pB8d-vEEW-Jxxk-ujc7-NWSegg'  0bec626d-2d44-417d-acfd-83acbbcf2b34
-else
-  search --no-floppy --fs-uuid --set=root 0bec626d-2d44-417d-acfd-83acbbcf2b34
-fi
-    font="/usr/share/grub/unicode.pf2"
-fi
-
-if loadfont $font ; then
-  set gfxmode=auto
-  load_video
-  insmod gfxterm
-  set locale_dir=$prefix/locale
-  set lang=pt_PT
-  insmod gettext
-fi
-terminal_output gfxterm
-if [ "${recordfail}" = 1 ] ; then
-  set timeout=-1
-else
-  if [ x$feature_timeout_style = xy ] ; then
-    set timeout_style=menu
-    set timeout=10
-  # Fallback normal timeout code in case the timeout_style feature is
-  # unavailable.
-  else
-    set timeout=10
-  fi
-fi
-### END /etc/grub.d/00_header ###
-
-### BEGIN /etc/grub.d/05_debian_theme ###
-set menu_color_normal=white/black
-set menu_color_highlight=black/light-gray
-### END /etc/grub.d/05_debian_theme ###
-
-### BEGIN /etc/grub.d/06_mint_theme ###
-set menu_color_normal=white/black
-set menu_color_highlight=white/light-gray
-### END /etc/grub.d/06_mint_theme ###
-
-### BEGIN /etc/grub.d/10_linux ###
-function gfxmode {
-	set gfxpayload="$1"
-	if [ "$1" = "keep" ]; then
-		set vt_handoff=vt.handoff=7
-	else
-		set vt_handoff=
-	fi
-}
-if [ ${recordfail} != 1 ]; then
-  if [ -e ${prefix}/gfxblacklist.txt ]; then
-    if hwmatch ${prefix}/gfxblacklist.txt 3; then
-      if [ ${match} = 0 ]; then
-        set linux_gfx_mode=keep
-      else
-        set linux_gfx_mode=text
-      fi
-    else
-      set linux_gfx_mode=text
-    fi
-  else
-    set linux_gfx_mode=keep
-  fi
-else
-  set linux_gfx_mode=text
-fi
-export linux_gfx_mode
-if [ "$linux_gfx_mode" != "text" ]; then load_video; fi
-menuentry 'Linux Mint 17 Xfce 64-bit, 3.13.0-24-generic (/dev/mapper/sa_sabayon-root)' --class ubuntu --class gnu-linux --class gnu --class os {
-	recordfail
-	gfxmode $linux_gfx_mode
-	insmod gzio
-	insmod part_msdos
-	insmod lvm
-	insmod ext2
-	set root='lvmid/ZvOK2H-W5xA-QoO2-zy2n-Sjr7-cpu8-M3zL6F/FzLrNP-IhMk-pB8d-vEEW-Jxxk-ujc7-NWSegg'
-	if [ x$feature_platform_search_hint = xy ]; then
-	  search --no-floppy --fs-uuid --set=root --hint='lvmid/ZvOK2H-W5xA-QoO2-zy2n-Sjr7-cpu8-M3zL6F/FzLrNP-IhMk-pB8d-vEEW-Jxxk-ujc7-NWSegg'  0bec626d-2d44-417d-acfd-83acbbcf2b34
-	else
-	  search --no-floppy --fs-uuid --set=root 0bec626d-2d44-417d-acfd-83acbbcf2b34
-	fi
-	linux	/boot/vmlinuz-3.13.0-24-generic root=/dev/mapper/sa_sabayon-root ro   quiet splash $vt_handoff
-	initrd	/boot/initrd.img-3.13.0-24-generic
-}
-### END /etc/grub.d/10_linux ###
-
-### BEGIN /etc/grub.d/10_lupin ###
-### END /etc/grub.d/10_lupin ###
-
-### BEGIN /etc/grub.d/20_linux_xen ###
-
-### END /etc/grub.d/20_linux_xen ###
-
-### BEGIN /etc/grub.d/20_memtest86+ ###
-menuentry 'Ubuntu_1404_x64_tiago' {
-	linux (hd0,msdos2)/kernel/kernel slxsrv=200.17.202.46 slxbase=ubuntu_1404_x64_tiago quiet splash vga=current
-	initrd (hd0,msdos2)/initramfs-stage31
-}
-### END /etc/grub.d/20_memtest86+ ###
-
-### BEGIN /etc/grub.d/30_os-prober ###
-set timeout_style=menu
-if [ "${timeout}" = 0 ]; then
-  set timeout=10
-fi
-### END /etc/grub.d/30_os-prober ###
-
-### BEGIN /etc/grub.d/30_uefi-firmware ###
-### END /etc/grub.d/30_uefi-firmware ###
-
-### BEGIN /etc/grub.d/40_custom ###
-# This file provides an easy way to add custom menu entries.  Simply type the
-# menu entries you want to add after this comment.  Be careful not to change
-# the 'exec tail' line above.
-### END /etc/grub.d/40_custom ###
-
-### BEGIN /etc/grub.d/41_custom ###
-if [ -f  ${config_directory}/custom.cfg ]; then
-  source ${config_directory}/custom.cfg
-elif [ -z "${config_directory}" -a -f  $prefix/custom.cfg ]; then
-  source $prefix/custom.cfg;
-fi
-### END /etc/grub.d/41_custom ###
diff --git a/remote/modules/grub/data/etc/grub/grub.default.style b/remote/modules/grub/data/etc/grub/grub.default.style
deleted file mode 100644
index af835d3b..00000000
--- a/remote/modules/grub/data/etc/grub/grub.default.style
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# DO NOT EDIT THIS FILE
-#
-# It is automatically generated by grub-mkconfig using templates
-# from /etc/grub.d and settings from /etc/default/grub
-#
-
-### BEGIN /etc/grub.d/00_header ###
-    set gfxmode=auto
-    load_video
-    insmod gfxterm
-    set lang=pt_PT
-    set timeout_style=menu
-    set timeout=10
-### END /etc/grub.d/00_header ###
-
-### BEGIN /etc/grub.d/05_debian_theme ###
-#set menu_color_normal=white/black
-#set menu_color_highlight=black/light-gray
-### END /etc/grub.d/05_debian_theme ###
-
-### BEGIN /etc/grub.d/06_mint_theme ###
-set menu_color_normal=white/black
-set menu_color_highlight=white/light-gray
-### END /etc/grub.d/06_mint_theme ###
-
-
diff --git a/remote/modules/grub/data/etc/grub/grubenv b/remote/modules/grub/data/etc/grub/grubenv
deleted file mode 100644
index f93ccbff..00000000
--- a/remote/modules/grub/data/etc/grub/grubenv
+++ /dev/null
@@ -1,2 +0,0 @@
-# GRUB Environment Block
-#######################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################################
\ No newline at end of file
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/915resolution.mod b/remote/modules/grub/data/etc/grub/i386-pc/915resolution.mod
deleted file mode 100644
index e0838914..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/915resolution.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/acpi.mod b/remote/modules/grub/data/etc/grub/i386-pc/acpi.mod
deleted file mode 100644
index 90ee529d..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/acpi.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/adler32.mod b/remote/modules/grub/data/etc/grub/i386-pc/adler32.mod
deleted file mode 100644
index 860624b3..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/adler32.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/affs.mod b/remote/modules/grub/data/etc/grub/i386-pc/affs.mod
deleted file mode 100644
index 7c4938de..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/affs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/afs.mod b/remote/modules/grub/data/etc/grub/i386-pc/afs.mod
deleted file mode 100644
index ef97926f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/afs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ahci.mod b/remote/modules/grub/data/etc/grub/i386-pc/ahci.mod
deleted file mode 100644
index 7a38c4fe..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/ahci.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/all_video.mod b/remote/modules/grub/data/etc/grub/i386-pc/all_video.mod
deleted file mode 100644
index ac321be6..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/all_video.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/aout.mod b/remote/modules/grub/data/etc/grub/i386-pc/aout.mod
deleted file mode 100644
index 40b64b64..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/aout.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/archelp.mod b/remote/modules/grub/data/etc/grub/i386-pc/archelp.mod
deleted file mode 100644
index 0b096945..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/archelp.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/at_keyboard.mod b/remote/modules/grub/data/etc/grub/i386-pc/at_keyboard.mod
deleted file mode 100644
index 83b558b3..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/at_keyboard.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ata.mod b/remote/modules/grub/data/etc/grub/i386-pc/ata.mod
deleted file mode 100644
index 1434a004..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/ata.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/backtrace.mod b/remote/modules/grub/data/etc/grub/i386-pc/backtrace.mod
deleted file mode 100644
index 2827ee69..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/backtrace.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/bfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/bfs.mod
deleted file mode 100644
index 062ada72..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/bfs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/biosdisk.mod b/remote/modules/grub/data/etc/grub/i386-pc/biosdisk.mod
deleted file mode 100644
index 9e9104d2..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/biosdisk.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/bitmap.mod b/remote/modules/grub/data/etc/grub/i386-pc/bitmap.mod
deleted file mode 100644
index ad777331..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/bitmap.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/bitmap_scale.mod b/remote/modules/grub/data/etc/grub/i386-pc/bitmap_scale.mod
deleted file mode 100644
index d6055683..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/bitmap_scale.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/blocklist.mod b/remote/modules/grub/data/etc/grub/i386-pc/blocklist.mod
deleted file mode 100644
index 37d39a21..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/blocklist.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/boot.img b/remote/modules/grub/data/etc/grub/i386-pc/boot.img
deleted file mode 100644
index 81a7a30a..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/boot.img and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/boot.mod b/remote/modules/grub/data/etc/grub/i386-pc/boot.mod
deleted file mode 100644
index 5a0ae46c..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/boot.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/bsd.mod b/remote/modules/grub/data/etc/grub/i386-pc/bsd.mod
deleted file mode 100644
index 6254c08d..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/bsd.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/btrfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/btrfs.mod
deleted file mode 100644
index d058eadd..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/btrfs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/bufio.mod b/remote/modules/grub/data/etc/grub/i386-pc/bufio.mod
deleted file mode 100644
index c14030a9..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/bufio.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cat.mod b/remote/modules/grub/data/etc/grub/i386-pc/cat.mod
deleted file mode 100644
index 70e13273..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cat.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cbfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/cbfs.mod
deleted file mode 100644
index 2fee8756..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cbfs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cbls.mod b/remote/modules/grub/data/etc/grub/i386-pc/cbls.mod
deleted file mode 100644
index 8885a529..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cbls.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cbmemc.mod b/remote/modules/grub/data/etc/grub/i386-pc/cbmemc.mod
deleted file mode 100644
index a9070914..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cbmemc.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cbtable.mod b/remote/modules/grub/data/etc/grub/i386-pc/cbtable.mod
deleted file mode 100644
index a97728b4..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cbtable.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cbtime.mod b/remote/modules/grub/data/etc/grub/i386-pc/cbtime.mod
deleted file mode 100644
index 58d2c8b9..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cbtime.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/chain.mod b/remote/modules/grub/data/etc/grub/i386-pc/chain.mod
deleted file mode 100644
index 047f4521..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/chain.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cmdline_cat_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/cmdline_cat_test.mod
deleted file mode 100644
index 127cd36a..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cmdline_cat_test.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cmosdump.mod b/remote/modules/grub/data/etc/grub/i386-pc/cmosdump.mod
deleted file mode 100644
index 914c5709..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cmosdump.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cmostest.mod b/remote/modules/grub/data/etc/grub/i386-pc/cmostest.mod
deleted file mode 100644
index 9051d318..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cmostest.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cmp.mod b/remote/modules/grub/data/etc/grub/i386-pc/cmp.mod
deleted file mode 100644
index 18a86034..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cmp.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/command.lst b/remote/modules/grub/data/etc/grub/i386-pc/command.lst
deleted file mode 100644
index d3d74ed4..00000000
--- a/remote/modules/grub/data/etc/grub/i386-pc/command.lst
+++ /dev/null
@@ -1,199 +0,0 @@
-*acpi: acpi
-*all_functional_test: functional_test
-*background_image: gfxterm_background
-*cat: cat
-*cpuid: cpuid
-*crc: hashsum
-*cryptomount: cryptodisk
-*drivemap: drivemap
-*echo: echo
-*extract_syslinux_entries_configfile: syslinuxcfg
-*extract_syslinux_entries_source: syslinuxcfg
-*file: file
-*functional_test: functional_test
-*gettext: gettext
-*halt: halt
-*hashsum: hashsum
-*hdparm: hdparm
-*hello: hello
-*help: help
-*hexdump: hexdump
-*inb: iorw
-*inl: iorw
-*inw: iorw
-*keystatus: keystatus
-*kfreebsd: bsd
-*knetbsd: bsd
-*kopenbsd: bsd
-*list_env: loadenv
-*load_env: loadenv
-*loopback: loopback
-*ls: ls
-*lsacpi: lsacpi
-*lspci: lspci
-*md5sum: hashsum
-*menuentry: normal
-*pcidump: pcidump
-*plan9: plan9
-*probe: probe
-*read_byte: memrw
-*read_dword: memrw
-*read_word: memrw
-*regexp: regexp
-*save_env: loadenv
-*search: search
-*sendkey: sendkey
-*serial: serial
-*setpci: setpci
-*sha1sum: hashsum
-*sha256sum: hashsum
-*sha512sum: hashsum
-*sleep: sleep
-*submenu: normal
-*syslinux_configfile: syslinuxcfg
-*syslinux_source: syslinuxcfg
-*terminfo: terminfo
-*test_blockarg: test_blockarg
-*testspeed: testspeed
-*tr: tr
-*trust: verify
-*verify_detached: verify
-*xnu_splash: xnu
-*zfskey: zfscrypt
-.: configfile
-915resolution: 915resolution
-[: test
-authenticate: normal
-background_color: gfxterm_background
-backtrace: backtrace
-badram: mmap
-blocklist: blocklist
-boot: boot
-break: normal
-cat: minicmd
-cbmemc: cbmemc
-chainloader: chain
-clear: normal
-cmosclean: cmostest
-cmosdump: cmosdump
-cmosset: cmostest
-cmostest: cmostest
-cmp: cmp
-configfile: configfile
-continue: normal
-coreboot_boottime: cbtime
-cutmem: mmap
-date: date
-distrust: verify
-dump: minicmd
-efiemu_loadcore: efiemu
-efiemu_prepare: efiemu
-efiemu_unload: efiemu
-eval: eval
-exit: minicmd
-export: normal
-extract_entries_configfile: configfile
-extract_entries_source: configfile
-extract_legacy_entries_configfile: legacycfg
-extract_legacy_entries_source: legacycfg
-false: true
-freedos: freedos
-gdbstub: gdb
-gdbstub_break: gdb
-gdbstub_stop: gdb
-gptsync: gptsync
-help: minicmd
-hwmatch: hwmatch
-initrd16: linux16
-initrd: linux
-keymap: keylayouts
-kfreebsd_loadenv: bsd
-kfreebsd_module: bsd
-kfreebsd_module_elf: bsd
-knetbsd_module: bsd
-knetbsd_module_elf: bsd
-kopenbsd_ramdisk: bsd
-legacy_check_password: legacycfg
-legacy_configfile: legacycfg
-legacy_initrd: legacycfg
-legacy_initrd_nounzip: legacycfg
-legacy_kernel: legacycfg
-legacy_password: legacycfg
-legacy_source: legacycfg
-linux16: linux16
-linux: linux
-list_trusted: verify
-loadfont: font
-lsapm: lsapm
-lscoreboot: cbls
-lsfonts: font
-lsmmap: lsmmap
-lsmod: minicmd
-macppcbless: macbless
-mactelbless: macbless
-module2: multiboot2
-module: multiboot
-multiboot2: multiboot2
-multiboot: multiboot
-nativedisk: nativedisk
-net_add_addr: net
-net_add_dns: net
-net_add_route: net
-net_bootp: net
-net_del_addr: net
-net_del_dns: net
-net_del_route: net
-net_get_dhcp_option: net
-net_ipv6_autoconf: net
-net_ls_addr: net
-net_ls_cards: net
-net_ls_dns: net
-net_ls_routes: net
-net_nslookup: net
-normal: normal
-normal_exit: normal
-ntldr: ntldr
-outb: iorw
-outl: iorw
-outw: iorw
-parttool: parttool
-password: password
-password_pbkdf2: password_pbkdf2
-play: play
-pxechainloader: pxechain
-read: read
-reboot: reboot
-return: normal
-rmmod: minicmd
-search.file: search_fs_file
-search.fs_label: search_label
-search.fs_uuid: search_fs_uuid
-setparams: normal
-shift: normal
-source: configfile
-terminal_input: terminal
-terminal_output: terminal
-test: test
-testload: testload
-time: time
-true: true
-truecrypt: truecrypt
-usb: usbtest
-vbeinfo: videoinfo
-vbetest: videotest
-videoinfo: videoinfo
-videotest: videotest
-write_byte: memrw
-write_dword: memrw
-write_word: memrw
-xnu_devprop_load: xnu
-xnu_kernel64: xnu
-xnu_kernel: xnu
-xnu_kext: xnu
-xnu_kextdir: xnu
-xnu_mkext: xnu
-xnu_ramdisk: xnu
-xnu_resume: xnu
-xnu_uuid: xnu_uuid
-zfs-bootfs: zfsinfo
-zfsinfo: zfsinfo
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/configfile.mod b/remote/modules/grub/data/etc/grub/i386-pc/configfile.mod
deleted file mode 100644
index b46c328e..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/configfile.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/core.img b/remote/modules/grub/data/etc/grub/i386-pc/core.img
deleted file mode 100644
index d84d8779..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/core.img and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cpio.mod b/remote/modules/grub/data/etc/grub/i386-pc/cpio.mod
deleted file mode 100644
index 284643da..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cpio.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cpio_be.mod b/remote/modules/grub/data/etc/grub/i386-pc/cpio_be.mod
deleted file mode 100644
index 14becb0b..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cpio_be.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cpuid.mod b/remote/modules/grub/data/etc/grub/i386-pc/cpuid.mod
deleted file mode 100644
index 156b5d21..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cpuid.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/crc64.mod b/remote/modules/grub/data/etc/grub/i386-pc/crc64.mod
deleted file mode 100644
index 9126be99..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/crc64.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/crypto.lst b/remote/modules/grub/data/etc/grub/i386-pc/crypto.lst
deleted file mode 100644
index 77d9efc0..00000000
--- a/remote/modules/grub/data/etc/grub/i386-pc/crypto.lst
+++ /dev/null
@@ -1,45 +0,0 @@
-RIJNDAEL: gcry_rijndael
-RIJNDAEL192: gcry_rijndael
-RIJNDAEL256: gcry_rijndael
-AES128: gcry_rijndael
-AES-128: gcry_rijndael
-AES-192: gcry_rijndael
-AES-256: gcry_rijndael
-ADLER32: adler32
-CRC64: crc64
-ARCFOUR: gcry_arcfour
-BLOWFISH: gcry_blowfish
-CAMELLIA128: gcry_camellia
-CAMELLIA192: gcry_camellia
-CAMELLIA256: gcry_camellia
-CAST5: gcry_cast5
-CRC32: gcry_crc
-CRC32RFC1510: gcry_crc
-CRC24RFC2440: gcry_crc
-DES: gcry_des
-3DES: gcry_des
-DSA: gcry_dsa
-IDEA: gcry_idea
-MD4: gcry_md4
-MD5: gcry_md5
-RFC2268_40: gcry_rfc2268
-AES: gcry_rijndael
-AES192: gcry_rijndael
-AES256: gcry_rijndael
-RIPEMD160: gcry_rmd160
-RSA: gcry_rsa
-SEED: gcry_seed
-SERPENT128: gcry_serpent
-SERPENT192: gcry_serpent
-SERPENT256: gcry_serpent
-SHA1: gcry_sha1
-SHA224: gcry_sha256
-SHA256: gcry_sha256
-SHA512: gcry_sha512
-SHA384: gcry_sha512
-TIGER192: gcry_tiger
-TIGER: gcry_tiger
-TIGER2: gcry_tiger
-TWOFISH: gcry_twofish
-TWOFISH128: gcry_twofish
-WHIRLPOOL: gcry_whirlpool
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/crypto.mod b/remote/modules/grub/data/etc/grub/i386-pc/crypto.mod
deleted file mode 100644
index 1ff552a4..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/crypto.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cryptodisk.mod b/remote/modules/grub/data/etc/grub/i386-pc/cryptodisk.mod
deleted file mode 100644
index d5376a5b..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cryptodisk.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/cs5536.mod b/remote/modules/grub/data/etc/grub/i386-pc/cs5536.mod
deleted file mode 100644
index 550b9d12..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/cs5536.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/date.mod b/remote/modules/grub/data/etc/grub/i386-pc/date.mod
deleted file mode 100644
index e89dc1a2..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/date.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/datehook.mod b/remote/modules/grub/data/etc/grub/i386-pc/datehook.mod
deleted file mode 100644
index 8eb4280d..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/datehook.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/datetime.mod b/remote/modules/grub/data/etc/grub/i386-pc/datetime.mod
deleted file mode 100644
index 25a29615..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/datetime.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/disk.mod b/remote/modules/grub/data/etc/grub/i386-pc/disk.mod
deleted file mode 100644
index f2aeada0..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/disk.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/diskfilter.mod b/remote/modules/grub/data/etc/grub/i386-pc/diskfilter.mod
deleted file mode 100644
index f1a45a33..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/diskfilter.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/div_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/div_test.mod
deleted file mode 100644
index 65bc32b8..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/div_test.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/dm_nv.mod b/remote/modules/grub/data/etc/grub/i386-pc/dm_nv.mod
deleted file mode 100644
index 32c26036..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/dm_nv.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/drivemap.mod b/remote/modules/grub/data/etc/grub/i386-pc/drivemap.mod
deleted file mode 100644
index 5410ef88..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/drivemap.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/echo.mod b/remote/modules/grub/data/etc/grub/i386-pc/echo.mod
deleted file mode 100644
index 057586dd..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/echo.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/efiemu.mod b/remote/modules/grub/data/etc/grub/i386-pc/efiemu.mod
deleted file mode 100644
index ab253550..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/efiemu.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/efiemu32.o b/remote/modules/grub/data/etc/grub/i386-pc/efiemu32.o
deleted file mode 100644
index 56fbedc9..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/efiemu32.o and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/efiemu64.o b/remote/modules/grub/data/etc/grub/i386-pc/efiemu64.o
deleted file mode 100644
index f25fe93c..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/efiemu64.o and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ehci.mod b/remote/modules/grub/data/etc/grub/i386-pc/ehci.mod
deleted file mode 100644
index 4ff3a9b8..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/ehci.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/elf.mod b/remote/modules/grub/data/etc/grub/i386-pc/elf.mod
deleted file mode 100644
index 35467cfd..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/elf.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/eval.mod b/remote/modules/grub/data/etc/grub/i386-pc/eval.mod
deleted file mode 100644
index 4250f0cc..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/eval.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/exfat.mod b/remote/modules/grub/data/etc/grub/i386-pc/exfat.mod
deleted file mode 100644
index 287bba3b..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/exfat.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/exfctest.mod b/remote/modules/grub/data/etc/grub/i386-pc/exfctest.mod
deleted file mode 100644
index 2e2f3329..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/exfctest.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ext2.mod b/remote/modules/grub/data/etc/grub/i386-pc/ext2.mod
deleted file mode 100644
index 291d8407..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/ext2.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/extcmd.mod b/remote/modules/grub/data/etc/grub/i386-pc/extcmd.mod
deleted file mode 100644
index 477c32be..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/extcmd.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/fat.mod b/remote/modules/grub/data/etc/grub/i386-pc/fat.mod
deleted file mode 100644
index fcac1440..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/fat.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/file.mod b/remote/modules/grub/data/etc/grub/i386-pc/file.mod
deleted file mode 100644
index ec327c2e..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/file.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/font.mod b/remote/modules/grub/data/etc/grub/i386-pc/font.mod
deleted file mode 100644
index 4e3ec10e..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/font.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/freedos.mod b/remote/modules/grub/data/etc/grub/i386-pc/freedos.mod
deleted file mode 100644
index d993f197..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/freedos.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/fs.lst b/remote/modules/grub/data/etc/grub/i386-pc/fs.lst
deleted file mode 100644
index a069ccc6..00000000
--- a/remote/modules/grub/data/etc/grub/i386-pc/fs.lst
+++ /dev/null
@@ -1,36 +0,0 @@
-affs
-afs
-bfs
-btrfs
-cbfs
-cpio
-cpio_be
-exfat
-ext2
-fat
-hfs
-hfsplus
-iso9660
-jfs
-minix
-minix2
-minix2_be
-minix3
-minix3_be
-minix_be
-newc
-nilfs2
-ntfs
-odc
-procfs
-reiserfs
-romfs
-sfs
-squash4
-tar
-udf
-ufs1
-ufs1_be
-ufs2
-xfs
-zfs
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/fshelp.mod b/remote/modules/grub/data/etc/grub/i386-pc/fshelp.mod
deleted file mode 100644
index 148f0611..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/fshelp.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/functional_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/functional_test.mod
deleted file mode 100644
index 0e6c57ca..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/functional_test.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_arcfour.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_arcfour.mod
deleted file mode 100644
index b73ad8e7..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_arcfour.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_blowfish.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_blowfish.mod
deleted file mode 100644
index 40aae3ee..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_blowfish.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_camellia.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_camellia.mod
deleted file mode 100644
index ab407e2c..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_camellia.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_cast5.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_cast5.mod
deleted file mode 100644
index 5e9050b2..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_cast5.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_crc.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_crc.mod
deleted file mode 100644
index 399f55ea..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_crc.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_des.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_des.mod
deleted file mode 100644
index 3ea8d86e..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_des.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_dsa.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_dsa.mod
deleted file mode 100644
index 2096dd9f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_dsa.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_idea.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_idea.mod
deleted file mode 100644
index a960ba8f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_idea.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_md4.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_md4.mod
deleted file mode 100644
index 95cacaf2..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_md4.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_md5.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_md5.mod
deleted file mode 100644
index 78920cd9..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_md5.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_rfc2268.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_rfc2268.mod
deleted file mode 100644
index de23884f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_rfc2268.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_rijndael.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_rijndael.mod
deleted file mode 100644
index 36294845..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_rijndael.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_rmd160.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_rmd160.mod
deleted file mode 100644
index 60ad46af..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_rmd160.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_rsa.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_rsa.mod
deleted file mode 100644
index 0a6eb841..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_rsa.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_seed.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_seed.mod
deleted file mode 100644
index a8bbe8d2..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_seed.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_serpent.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_serpent.mod
deleted file mode 100644
index 4a705f34..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_serpent.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha1.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha1.mod
deleted file mode 100644
index d7d433a6..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha1.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha256.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha256.mod
deleted file mode 100644
index 4d80a978..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha256.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha512.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha512.mod
deleted file mode 100644
index 2899bde9..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_sha512.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_tiger.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_tiger.mod
deleted file mode 100644
index 0442ac26..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_tiger.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_twofish.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_twofish.mod
deleted file mode 100644
index ada0491f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_twofish.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gcry_whirlpool.mod b/remote/modules/grub/data/etc/grub/i386-pc/gcry_whirlpool.mod
deleted file mode 100644
index 90d693ed..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gcry_whirlpool.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gdb.mod b/remote/modules/grub/data/etc/grub/i386-pc/gdb.mod
deleted file mode 100644
index 80e1c2ea..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gdb.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/geli.mod b/remote/modules/grub/data/etc/grub/i386-pc/geli.mod
deleted file mode 100644
index 4d84ca87..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/geli.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gettext.mod b/remote/modules/grub/data/etc/grub/i386-pc/gettext.mod
deleted file mode 100644
index f14e11d9..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gettext.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gfxmenu.mod b/remote/modules/grub/data/etc/grub/i386-pc/gfxmenu.mod
deleted file mode 100644
index ee520644..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gfxmenu.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gfxterm.mod b/remote/modules/grub/data/etc/grub/i386-pc/gfxterm.mod
deleted file mode 100644
index 48c96cf0..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gfxterm.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gfxterm_background.mod b/remote/modules/grub/data/etc/grub/i386-pc/gfxterm_background.mod
deleted file mode 100644
index 3d515a66..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gfxterm_background.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gfxterm_menu.mod b/remote/modules/grub/data/etc/grub/i386-pc/gfxterm_menu.mod
deleted file mode 100644
index 745af711..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gfxterm_menu.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gptsync.mod b/remote/modules/grub/data/etc/grub/i386-pc/gptsync.mod
deleted file mode 100644
index 24cc4fdd..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gptsync.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/gzio.mod b/remote/modules/grub/data/etc/grub/i386-pc/gzio.mod
deleted file mode 100644
index ade70438..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/gzio.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/halt.mod b/remote/modules/grub/data/etc/grub/i386-pc/halt.mod
deleted file mode 100644
index 454408a4..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/halt.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hashsum.mod b/remote/modules/grub/data/etc/grub/i386-pc/hashsum.mod
deleted file mode 100644
index 920dfa97..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/hashsum.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hdparm.mod b/remote/modules/grub/data/etc/grub/i386-pc/hdparm.mod
deleted file mode 100644
index 1e309ba1..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/hdparm.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hello.mod b/remote/modules/grub/data/etc/grub/i386-pc/hello.mod
deleted file mode 100644
index 993c5023..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/hello.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/help.mod b/remote/modules/grub/data/etc/grub/i386-pc/help.mod
deleted file mode 100644
index bd9cd4b3..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/help.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hexdump.mod b/remote/modules/grub/data/etc/grub/i386-pc/hexdump.mod
deleted file mode 100644
index 22fdcdd1..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/hexdump.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/hfs.mod
deleted file mode 100644
index 6dea54e6..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/hfs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hfsplus.mod b/remote/modules/grub/data/etc/grub/i386-pc/hfsplus.mod
deleted file mode 100644
index 125bc296..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/hfsplus.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hfspluscomp.mod b/remote/modules/grub/data/etc/grub/i386-pc/hfspluscomp.mod
deleted file mode 100644
index f8fea748..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/hfspluscomp.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/http.mod b/remote/modules/grub/data/etc/grub/i386-pc/http.mod
deleted file mode 100644
index aafd9fcb..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/http.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/hwmatch.mod b/remote/modules/grub/data/etc/grub/i386-pc/hwmatch.mod
deleted file mode 100644
index 77c5acc9..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/hwmatch.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/iorw.mod b/remote/modules/grub/data/etc/grub/i386-pc/iorw.mod
deleted file mode 100644
index 62fb885e..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/iorw.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/iso9660.mod b/remote/modules/grub/data/etc/grub/i386-pc/iso9660.mod
deleted file mode 100644
index 6decc762..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/iso9660.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/jfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/jfs.mod
deleted file mode 100644
index 100447a9..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/jfs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/jpeg.mod b/remote/modules/grub/data/etc/grub/i386-pc/jpeg.mod
deleted file mode 100644
index e07167c5..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/jpeg.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/keylayouts.mod b/remote/modules/grub/data/etc/grub/i386-pc/keylayouts.mod
deleted file mode 100644
index e2fb3d26..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/keylayouts.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/keystatus.mod b/remote/modules/grub/data/etc/grub/i386-pc/keystatus.mod
deleted file mode 100644
index 34eda64c..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/keystatus.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ldm.mod b/remote/modules/grub/data/etc/grub/i386-pc/ldm.mod
deleted file mode 100644
index 09397019..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/ldm.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/legacy_password_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/legacy_password_test.mod
deleted file mode 100644
index 6d3fbad4..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/legacy_password_test.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/legacycfg.mod b/remote/modules/grub/data/etc/grub/i386-pc/legacycfg.mod
deleted file mode 100644
index a06c1d8e..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/legacycfg.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/linux.mod b/remote/modules/grub/data/etc/grub/i386-pc/linux.mod
deleted file mode 100644
index 7934b5fb..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/linux.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/linux16.mod b/remote/modules/grub/data/etc/grub/i386-pc/linux16.mod
deleted file mode 100644
index 0418bae7..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/linux16.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/loadenv.mod b/remote/modules/grub/data/etc/grub/i386-pc/loadenv.mod
deleted file mode 100644
index af08f023..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/loadenv.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/loopback.mod b/remote/modules/grub/data/etc/grub/i386-pc/loopback.mod
deleted file mode 100644
index 2f04e009..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/loopback.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ls.mod b/remote/modules/grub/data/etc/grub/i386-pc/ls.mod
deleted file mode 100644
index 38e8bdc7..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/ls.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/lsacpi.mod b/remote/modules/grub/data/etc/grub/i386-pc/lsacpi.mod
deleted file mode 100644
index 1b6b95d6..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/lsacpi.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/lsapm.mod b/remote/modules/grub/data/etc/grub/i386-pc/lsapm.mod
deleted file mode 100644
index e999c8c4..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/lsapm.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/lsmmap.mod b/remote/modules/grub/data/etc/grub/i386-pc/lsmmap.mod
deleted file mode 100644
index 2becf200..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/lsmmap.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/lspci.mod b/remote/modules/grub/data/etc/grub/i386-pc/lspci.mod
deleted file mode 100644
index d634a0f3..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/lspci.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/luks.mod b/remote/modules/grub/data/etc/grub/i386-pc/luks.mod
deleted file mode 100644
index baae79e9..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/luks.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/lvm.mod b/remote/modules/grub/data/etc/grub/i386-pc/lvm.mod
deleted file mode 100644
index 1e38f71a..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/lvm.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/lzopio.mod b/remote/modules/grub/data/etc/grub/i386-pc/lzopio.mod
deleted file mode 100644
index 35a70758..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/lzopio.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/macbless.mod b/remote/modules/grub/data/etc/grub/i386-pc/macbless.mod
deleted file mode 100644
index 454d4b18..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/macbless.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/macho.mod b/remote/modules/grub/data/etc/grub/i386-pc/macho.mod
deleted file mode 100644
index 43ff2400..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/macho.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/mda_text.mod b/remote/modules/grub/data/etc/grub/i386-pc/mda_text.mod
deleted file mode 100644
index aadfd666..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/mda_text.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/mdraid09.mod b/remote/modules/grub/data/etc/grub/i386-pc/mdraid09.mod
deleted file mode 100644
index d28b8e0d..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/mdraid09.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/mdraid09_be.mod b/remote/modules/grub/data/etc/grub/i386-pc/mdraid09_be.mod
deleted file mode 100644
index 477cdf86..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/mdraid09_be.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/mdraid1x.mod b/remote/modules/grub/data/etc/grub/i386-pc/mdraid1x.mod
deleted file mode 100644
index c2e0604a..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/mdraid1x.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/memdisk.mod b/remote/modules/grub/data/etc/grub/i386-pc/memdisk.mod
deleted file mode 100644
index dbea6234..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/memdisk.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/memrw.mod b/remote/modules/grub/data/etc/grub/i386-pc/memrw.mod
deleted file mode 100644
index 7029e0c4..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/memrw.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/minicmd.mod b/remote/modules/grub/data/etc/grub/i386-pc/minicmd.mod
deleted file mode 100644
index 1f734a86..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/minicmd.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/minix.mod b/remote/modules/grub/data/etc/grub/i386-pc/minix.mod
deleted file mode 100644
index 2eced0d6..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/minix.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/minix2.mod b/remote/modules/grub/data/etc/grub/i386-pc/minix2.mod
deleted file mode 100644
index 48aced6d..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/minix2.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/minix2_be.mod b/remote/modules/grub/data/etc/grub/i386-pc/minix2_be.mod
deleted file mode 100644
index b2706bf9..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/minix2_be.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/minix3.mod b/remote/modules/grub/data/etc/grub/i386-pc/minix3.mod
deleted file mode 100644
index 96a15241..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/minix3.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/minix3_be.mod b/remote/modules/grub/data/etc/grub/i386-pc/minix3_be.mod
deleted file mode 100644
index 5cac8129..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/minix3_be.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/minix_be.mod b/remote/modules/grub/data/etc/grub/i386-pc/minix_be.mod
deleted file mode 100644
index 4862b67d..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/minix_be.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/mmap.mod b/remote/modules/grub/data/etc/grub/i386-pc/mmap.mod
deleted file mode 100644
index f2803d78..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/mmap.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/moddep.lst b/remote/modules/grub/data/etc/grub/i386-pc/moddep.lst
deleted file mode 100644
index 57590dd9..00000000
--- a/remote/modules/grub/data/etc/grub/i386-pc/moddep.lst
+++ /dev/null
@@ -1,259 +0,0 @@
-squash4: xzio gzio lzopio fshelp
-search_fs_uuid:
-legacycfg: linux gcry_md5 crypto password normal
-date: datetime normal
-bfs:
-uhci: pci usb
-multiboot2: boot video net acpi relocator mmap lsapm vbe
-gcry_twofish: crypto
-cpio_be: archelp
-cmostest:
-priority_queue:
-gcry_rijndael: crypto
-freedos: boot video relocator chain
-echo: extcmd
-cpio: archelp
-xzio: crypto
-part_sun:
-hfspluscomp: gzio hfsplus
-gcry_sha512: crypto
-gcry_cast5: crypto
-boot:
-setjmp_test: setjmp functional_test
-odc: archelp
-ls: extcmd normal
-gzio:
-cbmemc: cbtable terminfo normal
-video:
-test_blockarg: extcmd normal
-gfxterm: video font
-cbtable:
-gcry_tiger: crypto
-gcry_serpent: crypto
-aout:
-macbless: disk
-gcry_blowfish: crypto
-trig:
-plan9: boot video extcmd relocator
-extcmd:
-at_keyboard: boot keylayouts
-videoinfo: video
-testspeed: extcmd normal
-pxe: boot net
-minix:
-keylayouts:
-xnu_uuid: gcry_md5
-usbtest: usb
-usbms: usb scsi
-reboot: relocator
-morse:
-help: extcmd normal
-part_msdos:
-http: net
-gdb: backtrace serial
-gcry_rsa: mpi verify
-cbtime: cbtable
-blocklist:
-probe: extcmd
-pbkdf2: crypto
-gcry_rfc2268: crypto
-ufs1_be:
-nativedisk:
-gcry_camellia: crypto
-fat:
-exfctest: functional_test
-pci:
-parttool: normal
-lzopio: crypto
-linux: boot video relocator mmap vbe normal
-gcry_md4: crypto
-zfsinfo: zfs
-usb_keyboard: keylayouts usb
-pxechain: boot video pxe relocator
-gcry_md5: crypto
-fshelp:
-ehci: boot pci usb cs5536
-bitmap_scale: bitmap
-ata: scsi
-datetime:
-usbserial_common: usb serial
-syslinuxcfg: extcmd normal
-net: priority_queue boot datetime bufio
-gcry_des: crypto
-div_test: functional_test
-time:
-reiserfs: fshelp
-dm_nv: diskfilter
-datehook: datetime normal
-mdraid09_be: diskfilter
-efiemu: crypto acpi cpuid gcry_crc
-backtrace:
-ahci: boot pci ata
-kernel:
-video_cirrus: video pci video_fb
-part_plan:
-gcry_seed: crypto
-minix_be:
-crypto:
-video_colors:
-test:
-terminal:
-part_dvh:
-lsacpi: extcmd acpi
-jpeg: bufio bitmap
-bsd: boot video aout extcmd gcry_md5 crypto cpuid elf relocator serial mmap vbe
-memdisk:
-gfxmenu: video gfxterm trig bitmap_scale video_colors bitmap normal font
-cmp:
-acpi: extcmd mmap
-xfs: fshelp
-elf:
-cpuid: extcmd
-affs: fshelp
-usb: pci
-videotest: video gfxmenu font
-tr: extcmd
-testload:
-relocator: mmap
-play:
-gfxterm_menu: video_fb functional_test procfs normal font
-cbfs: archelp
-adler32: crypto
-progress: normal
-password: crypto normal
-part_sunpc:
-video_fb:
-tftp: priority_queue net
-sleep: extcmd normal
-serial: extcmd terminfo
-search_fs_file:
-gcry_sha256: crypto
-gcry_rmd160: crypto
-exfat:
-search: search_fs_uuid extcmd search_fs_file search_label
-mdraid09: diskfilter
-chain: boot video relocator
-mpi: crypto
-memrw: extcmd
-cs5536: pci
-password_pbkdf2: gcry_sha512 pbkdf2 crypto normal
-mdraid1x: diskfilter
-linux16: boot video relocator mmap
-gcry_crc: crypto
-configfile: normal
-zfscrypt: gcry_rijndael extcmd pbkdf2 crypto zfs gcry_sha1
-signature_test: functional_test procfs
-raid5rec: diskfilter
-pcidump: extcmd pci
-gcry_arcfour: crypto
-sendkey: boot extcmd
-part_dfly:
-minix2_be:
-gettext:
-pbkdf2_test: pbkdf2 gcry_sha1 functional_test
-hello: extcmd
-vga_text:
-usbserial_pl2303: usbserial_common usb serial
-hashsum: extcmd crypto normal
-xnu_uuid_test: functional_test
-regexp: extcmd normal
-part_gpt:
-ohci: boot pci usb cs5536
-gptsync: disk
-zfs: gzio
-part_apple:
-hdparm: extcmd
-bufio:
-btrfs: gzio lzopio
-bitmap:
-true:
-terminfo: extcmd
-romfs: fshelp
-ntfscomp: ntfs
-hfs:
-gcry_dsa: mpi verify
-cmdline_cat_test: video_fb functional_test procfs normal font
-biosdisk:
-ufs1:
-offsetio:
-ntldr: boot video relocator chain
-legacy_password_test: legacycfg functional_test
-setjmp:
-ufs2:
-nilfs2: fshelp
-lsmmap:
-gcry_sha1: crypto
-cmosdump:
-915resolution:
-mmap: boot
-tar: archelp
-png: bufio bitmap
-lspci: extcmd pci
-hfsplus: fshelp
-cbls: cbtable
-tga: bufio bitmap
-minix2:
-setpci: extcmd pci
-scsi:
-pata: pci ata
-minix3:
-lvm: diskfilter
-lsapm:
-functional_test: video extcmd video_fb btrfs
-eval: normal
-iso9660: fshelp
-crc64: crypto
-vbe: video video_fb
-udf: fshelp
-search_label:
-raid6rec: diskfilter
-msdospart: parttool disk
-mda_text:
-archelp:
-procfs:
-minix3_be:
-halt: extcmd acpi
-xnu: boot video extcmd bitmap_scale efiemu relocator bitmap macho
-read:
-multiboot: boot video net relocator mmap lsapm vbe
-keystatus: extcmd
-cryptodisk: extcmd crypto procfs
-truecrypt: boot gzio video relocator mmap
-normal: boot extcmd crypto terminal gettext
-geli: gcry_sha512 pbkdf2 crypto gcry_sha256 cryptodisk
-spkmodem: terminfo
-gcry_idea: crypto
-video_bochs: video pci video_fb
-verify: extcmd crypto mpi gcry_sha1
-sfs: fshelp
-part_amiga:
-luks: pbkdf2 crypto cryptodisk
-loopback: extcmd
-jfs:
-gfxterm_background: gfxterm video extcmd bitmap_scale video_colors bitmap
-usbserial_usbdebug: usbserial_common usb serial
-part_acorn:
-newc: archelp
-macho:
-iorw: extcmd
-hwmatch: pci normal
-cat: extcmd
-afs:
-sleep_test: datetime functional_test
-ldm: part_msdos part_gpt diskfilter
-hexdump: extcmd
-disk:
-usbserial_ftdi: usbserial_common usb serial
-minicmd:
-loadenv: extcmd disk
-gcry_whirlpool: crypto
-drivemap: boot extcmd mmap
-vga: video video_fb
-part_bsd: part_msdos
-font: video bufio
-ext2: fshelp
-diskfilter:
-videotest_checksum: video_fb functional_test font
-file: extcmd elf offsetio macho
-ntfs: fshelp
-all_video: vbe vga video_bochs video_cirrus
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/modinfo.sh b/remote/modules/grub/data/etc/grub/i386-pc/modinfo.sh
deleted file mode 100644
index ee13a0dd..00000000
--- a/remote/modules/grub/data/etc/grub/i386-pc/modinfo.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-# User-controllable options
-grub_modinfo_target_cpu=i386
-grub_modinfo_platform=pc
-grub_disk_cache_stats=0
-grub_boot_time_stats=0
-grub_have_font_source=1
-
-# Autodetected config
-grub_have_asm_uscore=0
-grub_i8086_addr32="addr32"
-grub_i8086_data32="data32"
-grub_bss_start_symbol="__bss_start"
-grub_end_symbol="end"
-
-# Build environment
-grub_target_cc='gcc-4.7'
-grub_target_cc_version='gcc-4.7 (Ubuntu/Linaro 4.7.3-12ubuntu1) 4.7.3'
-grub_target_cflags=' -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -march=i386 -m32 -mrtd -mregparm=3 -falign-jumps=1 -falign-loops=1 -falign-functions=1 -freg-struct-return -mno-mmx -mno-sse -mno-sse2 -mno-3dnow -fno-dwarf2-cfi-asm -fno-asynchronous-unwind-tables -Qn -fno-stack-protector -Wtrampolines -Werror'
-grub_target_cppflags='-Wno-unused-but-set-variable -Wall -W -I$(top_srcdir)/include -I$(top_builddir)/include  -DGRUB_MACHINE_PCBIOS=1 -DGRUB_MACHINE=I386_PC -m32 -nostdinc -isystem /usr/lib/gcc/x86_64-linux-gnu/4.7/include'
-grub_target_ccasflags=' -g -m32'
-grub_target_ldflags=' -m32 -Wl,-melf_i386 -Wl,--build-id=none'
-grub_target_strip='strip'
-grub_target_nm='nm'
-grub_target_ranlib='ranlib'
-grub_target_objconf=''
-grub_target_obj2elf=''
-
-# Version
-grub_version="2.02~beta2"
-grub_package="grub"
-grub_package_string="GRUB 2.02~beta2-9"
-grub_package_version="2.02~beta2-9"
-grub_package_name="GRUB"
-grub_package_bugreport="bug-grub@gnu.org"
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/morse.mod b/remote/modules/grub/data/etc/grub/i386-pc/morse.mod
deleted file mode 100644
index c32f7049..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/morse.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/mpi.mod b/remote/modules/grub/data/etc/grub/i386-pc/mpi.mod
deleted file mode 100644
index 4bbbee3d..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/mpi.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/msdospart.mod b/remote/modules/grub/data/etc/grub/i386-pc/msdospart.mod
deleted file mode 100644
index 05ecea4b..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/msdospart.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/multiboot.mod b/remote/modules/grub/data/etc/grub/i386-pc/multiboot.mod
deleted file mode 100644
index c5e09ddf..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/multiboot.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/multiboot2.mod b/remote/modules/grub/data/etc/grub/i386-pc/multiboot2.mod
deleted file mode 100644
index 313863c2..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/multiboot2.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/nativedisk.mod b/remote/modules/grub/data/etc/grub/i386-pc/nativedisk.mod
deleted file mode 100644
index 2adc04d6..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/nativedisk.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/net.mod b/remote/modules/grub/data/etc/grub/i386-pc/net.mod
deleted file mode 100644
index 33c17fb8..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/net.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/newc.mod b/remote/modules/grub/data/etc/grub/i386-pc/newc.mod
deleted file mode 100644
index 96b0ea98..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/newc.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/nilfs2.mod b/remote/modules/grub/data/etc/grub/i386-pc/nilfs2.mod
deleted file mode 100644
index da0132dd..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/nilfs2.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/normal.mod b/remote/modules/grub/data/etc/grub/i386-pc/normal.mod
deleted file mode 100644
index b53f47c6..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/normal.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ntfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/ntfs.mod
deleted file mode 100644
index f6fbf761..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/ntfs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ntfscomp.mod b/remote/modules/grub/data/etc/grub/i386-pc/ntfscomp.mod
deleted file mode 100644
index 633a8747..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/ntfscomp.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ntldr.mod b/remote/modules/grub/data/etc/grub/i386-pc/ntldr.mod
deleted file mode 100644
index d61667e1..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/ntldr.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/odc.mod b/remote/modules/grub/data/etc/grub/i386-pc/odc.mod
deleted file mode 100644
index abc4a01e..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/odc.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/offsetio.mod b/remote/modules/grub/data/etc/grub/i386-pc/offsetio.mod
deleted file mode 100644
index cc616a9b..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/offsetio.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ohci.mod b/remote/modules/grub/data/etc/grub/i386-pc/ohci.mod
deleted file mode 100644
index 8f1fbf32..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/ohci.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_acorn.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_acorn.mod
deleted file mode 100644
index 23c6dfd1..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/part_acorn.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_amiga.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_amiga.mod
deleted file mode 100644
index fc74750e..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/part_amiga.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_apple.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_apple.mod
deleted file mode 100644
index ff48dcba..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/part_apple.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_bsd.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_bsd.mod
deleted file mode 100644
index e0af3dfb..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/part_bsd.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_dfly.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_dfly.mod
deleted file mode 100644
index 3f7549a2..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/part_dfly.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_dvh.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_dvh.mod
deleted file mode 100644
index c0697bbc..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/part_dvh.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_gpt.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_gpt.mod
deleted file mode 100644
index 83ce6bbd..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/part_gpt.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_msdos.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_msdos.mod
deleted file mode 100644
index ff5780a3..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/part_msdos.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_plan.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_plan.mod
deleted file mode 100644
index 1fb1f9af..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/part_plan.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_sun.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_sun.mod
deleted file mode 100644
index bf74b2c4..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/part_sun.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/part_sunpc.mod b/remote/modules/grub/data/etc/grub/i386-pc/part_sunpc.mod
deleted file mode 100644
index 3799e643..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/part_sunpc.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/partmap.lst b/remote/modules/grub/data/etc/grub/i386-pc/partmap.lst
deleted file mode 100644
index 761233aa..00000000
--- a/remote/modules/grub/data/etc/grub/i386-pc/partmap.lst
+++ /dev/null
@@ -1,11 +0,0 @@
-part_acorn
-part_amiga
-part_apple
-part_bsd
-part_dfly
-part_dvh
-part_gpt
-part_msdos
-part_plan
-part_sun
-part_sunpc
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/parttool.lst b/remote/modules/grub/data/etc/grub/i386-pc/parttool.lst
deleted file mode 100644
index 68b4b5c4..00000000
--- a/remote/modules/grub/data/etc/grub/i386-pc/parttool.lst
+++ /dev/null
@@ -1 +0,0 @@
-msdos: msdospart
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/parttool.mod b/remote/modules/grub/data/etc/grub/i386-pc/parttool.mod
deleted file mode 100644
index bd8d162d..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/parttool.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/password.mod b/remote/modules/grub/data/etc/grub/i386-pc/password.mod
deleted file mode 100644
index 4be1b2fd..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/password.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/password_pbkdf2.mod b/remote/modules/grub/data/etc/grub/i386-pc/password_pbkdf2.mod
deleted file mode 100644
index d195763d..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/password_pbkdf2.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/pata.mod b/remote/modules/grub/data/etc/grub/i386-pc/pata.mod
deleted file mode 100644
index b890127f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/pata.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/pbkdf2.mod b/remote/modules/grub/data/etc/grub/i386-pc/pbkdf2.mod
deleted file mode 100644
index 821c8cdf..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/pbkdf2.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/pbkdf2_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/pbkdf2_test.mod
deleted file mode 100644
index cf7e2052..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/pbkdf2_test.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/pci.mod b/remote/modules/grub/data/etc/grub/i386-pc/pci.mod
deleted file mode 100644
index 1986684e..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/pci.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/pcidump.mod b/remote/modules/grub/data/etc/grub/i386-pc/pcidump.mod
deleted file mode 100644
index 1fd30f20..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/pcidump.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/plan9.mod b/remote/modules/grub/data/etc/grub/i386-pc/plan9.mod
deleted file mode 100644
index 3210286a..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/plan9.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/play.mod b/remote/modules/grub/data/etc/grub/i386-pc/play.mod
deleted file mode 100644
index 5b3d7636..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/play.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/png.mod b/remote/modules/grub/data/etc/grub/i386-pc/png.mod
deleted file mode 100644
index 18a3d543..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/png.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/priority_queue.mod b/remote/modules/grub/data/etc/grub/i386-pc/priority_queue.mod
deleted file mode 100644
index 5da44071..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/priority_queue.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/probe.mod b/remote/modules/grub/data/etc/grub/i386-pc/probe.mod
deleted file mode 100644
index 265955a8..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/probe.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/procfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/procfs.mod
deleted file mode 100644
index 3123ddb8..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/procfs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/progress.mod b/remote/modules/grub/data/etc/grub/i386-pc/progress.mod
deleted file mode 100644
index 1c1f1c75..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/progress.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/pxe.mod b/remote/modules/grub/data/etc/grub/i386-pc/pxe.mod
deleted file mode 100644
index d56ae9b9..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/pxe.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/pxechain.mod b/remote/modules/grub/data/etc/grub/i386-pc/pxechain.mod
deleted file mode 100644
index 74333e72..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/pxechain.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/raid5rec.mod b/remote/modules/grub/data/etc/grub/i386-pc/raid5rec.mod
deleted file mode 100644
index d2f6858e..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/raid5rec.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/raid6rec.mod b/remote/modules/grub/data/etc/grub/i386-pc/raid6rec.mod
deleted file mode 100644
index 5d798aa2..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/raid6rec.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/read.mod b/remote/modules/grub/data/etc/grub/i386-pc/read.mod
deleted file mode 100644
index a24a6a5f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/read.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/reboot.mod b/remote/modules/grub/data/etc/grub/i386-pc/reboot.mod
deleted file mode 100644
index e0e05c86..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/reboot.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/regexp.mod b/remote/modules/grub/data/etc/grub/i386-pc/regexp.mod
deleted file mode 100644
index 90e0b4e8..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/regexp.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/reiserfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/reiserfs.mod
deleted file mode 100644
index bf12048e..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/reiserfs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/relocator.mod b/remote/modules/grub/data/etc/grub/i386-pc/relocator.mod
deleted file mode 100644
index a82bce2f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/relocator.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/romfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/romfs.mod
deleted file mode 100644
index aee8ffe7..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/romfs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/scsi.mod b/remote/modules/grub/data/etc/grub/i386-pc/scsi.mod
deleted file mode 100644
index 1f1659b7..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/scsi.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/search.mod b/remote/modules/grub/data/etc/grub/i386-pc/search.mod
deleted file mode 100644
index b02e3a53..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/search.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/search_fs_file.mod b/remote/modules/grub/data/etc/grub/i386-pc/search_fs_file.mod
deleted file mode 100644
index a0ee205c..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/search_fs_file.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/search_fs_uuid.mod b/remote/modules/grub/data/etc/grub/i386-pc/search_fs_uuid.mod
deleted file mode 100644
index e8050f1d..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/search_fs_uuid.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/search_label.mod b/remote/modules/grub/data/etc/grub/i386-pc/search_label.mod
deleted file mode 100644
index c0c2eb1f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/search_label.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/sendkey.mod b/remote/modules/grub/data/etc/grub/i386-pc/sendkey.mod
deleted file mode 100644
index f70d3ea5..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/sendkey.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/serial.mod b/remote/modules/grub/data/etc/grub/i386-pc/serial.mod
deleted file mode 100644
index a4709e0d..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/serial.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/setjmp.mod b/remote/modules/grub/data/etc/grub/i386-pc/setjmp.mod
deleted file mode 100644
index b54bfdf7..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/setjmp.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/setjmp_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/setjmp_test.mod
deleted file mode 100644
index 08791725..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/setjmp_test.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/setpci.mod b/remote/modules/grub/data/etc/grub/i386-pc/setpci.mod
deleted file mode 100644
index 4068447a..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/setpci.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/sfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/sfs.mod
deleted file mode 100644
index 9bc0c539..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/sfs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/signature_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/signature_test.mod
deleted file mode 100644
index 0404260e..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/signature_test.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/sleep.mod b/remote/modules/grub/data/etc/grub/i386-pc/sleep.mod
deleted file mode 100644
index 03ea1523..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/sleep.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/sleep_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/sleep_test.mod
deleted file mode 100644
index 6643135b..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/sleep_test.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/spkmodem.mod b/remote/modules/grub/data/etc/grub/i386-pc/spkmodem.mod
deleted file mode 100644
index 64cccde5..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/spkmodem.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/squash4.mod b/remote/modules/grub/data/etc/grub/i386-pc/squash4.mod
deleted file mode 100644
index 9a955f2d..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/squash4.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/syslinuxcfg.mod b/remote/modules/grub/data/etc/grub/i386-pc/syslinuxcfg.mod
deleted file mode 100644
index 533ca6fc..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/syslinuxcfg.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/tar.mod b/remote/modules/grub/data/etc/grub/i386-pc/tar.mod
deleted file mode 100644
index aa730d40..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/tar.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/terminal.lst b/remote/modules/grub/data/etc/grub/i386-pc/terminal.lst
deleted file mode 100644
index 2cb224c4..00000000
--- a/remote/modules/grub/data/etc/grub/i386-pc/terminal.lst
+++ /dev/null
@@ -1,11 +0,0 @@
-iat_keyboard: at_keyboard
-iserial: serial
-iserial_*: serial
-oaudio: morse
-ocbmemc: cbmemc
-ogfxterm: gfxterm
-omda_text: mda_text
-oserial: serial
-oserial_*: serial
-ospkmodem: spkmodem
-ovga_text: vga_text
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/terminal.mod b/remote/modules/grub/data/etc/grub/i386-pc/terminal.mod
deleted file mode 100644
index e69ffeaa..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/terminal.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/terminfo.mod b/remote/modules/grub/data/etc/grub/i386-pc/terminfo.mod
deleted file mode 100644
index 802dde46..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/terminfo.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/test.mod b/remote/modules/grub/data/etc/grub/i386-pc/test.mod
deleted file mode 100644
index a64efab1..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/test.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/test_blockarg.mod b/remote/modules/grub/data/etc/grub/i386-pc/test_blockarg.mod
deleted file mode 100644
index aae21993..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/test_blockarg.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/testload.mod b/remote/modules/grub/data/etc/grub/i386-pc/testload.mod
deleted file mode 100644
index 7bc62b18..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/testload.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/testspeed.mod b/remote/modules/grub/data/etc/grub/i386-pc/testspeed.mod
deleted file mode 100644
index cdef4145..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/testspeed.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/tftp.mod b/remote/modules/grub/data/etc/grub/i386-pc/tftp.mod
deleted file mode 100644
index 631c609f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/tftp.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/tga.mod b/remote/modules/grub/data/etc/grub/i386-pc/tga.mod
deleted file mode 100644
index 01e24f2a..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/tga.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/time.mod b/remote/modules/grub/data/etc/grub/i386-pc/time.mod
deleted file mode 100644
index 41ede536..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/time.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/tr.mod b/remote/modules/grub/data/etc/grub/i386-pc/tr.mod
deleted file mode 100644
index 0ed46ded..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/tr.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/trig.mod b/remote/modules/grub/data/etc/grub/i386-pc/trig.mod
deleted file mode 100644
index 845a9eda..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/trig.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/true.mod b/remote/modules/grub/data/etc/grub/i386-pc/true.mod
deleted file mode 100644
index 92a4871a..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/true.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/truecrypt.mod b/remote/modules/grub/data/etc/grub/i386-pc/truecrypt.mod
deleted file mode 100644
index 3085be5d..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/truecrypt.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/udf.mod b/remote/modules/grub/data/etc/grub/i386-pc/udf.mod
deleted file mode 100644
index 32ff4e9f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/udf.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ufs1.mod b/remote/modules/grub/data/etc/grub/i386-pc/ufs1.mod
deleted file mode 100644
index a5d0212a..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/ufs1.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ufs1_be.mod b/remote/modules/grub/data/etc/grub/i386-pc/ufs1_be.mod
deleted file mode 100644
index 0d8cda79..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/ufs1_be.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/ufs2.mod b/remote/modules/grub/data/etc/grub/i386-pc/ufs2.mod
deleted file mode 100644
index c37ec580..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/ufs2.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/uhci.mod b/remote/modules/grub/data/etc/grub/i386-pc/uhci.mod
deleted file mode 100644
index 15fac145..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/uhci.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usb.mod b/remote/modules/grub/data/etc/grub/i386-pc/usb.mod
deleted file mode 100644
index d871918f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/usb.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usb_keyboard.mod b/remote/modules/grub/data/etc/grub/i386-pc/usb_keyboard.mod
deleted file mode 100644
index 5387c303..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/usb_keyboard.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usbms.mod b/remote/modules/grub/data/etc/grub/i386-pc/usbms.mod
deleted file mode 100644
index bb141fba..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/usbms.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usbserial_common.mod b/remote/modules/grub/data/etc/grub/i386-pc/usbserial_common.mod
deleted file mode 100644
index 1867a4eb..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/usbserial_common.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usbserial_ftdi.mod b/remote/modules/grub/data/etc/grub/i386-pc/usbserial_ftdi.mod
deleted file mode 100644
index b5944cf2..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/usbserial_ftdi.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usbserial_pl2303.mod b/remote/modules/grub/data/etc/grub/i386-pc/usbserial_pl2303.mod
deleted file mode 100644
index 60209da6..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/usbserial_pl2303.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usbserial_usbdebug.mod b/remote/modules/grub/data/etc/grub/i386-pc/usbserial_usbdebug.mod
deleted file mode 100644
index 7b0d3825..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/usbserial_usbdebug.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/usbtest.mod b/remote/modules/grub/data/etc/grub/i386-pc/usbtest.mod
deleted file mode 100644
index 575871c0..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/usbtest.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/vbe.mod b/remote/modules/grub/data/etc/grub/i386-pc/vbe.mod
deleted file mode 100644
index dd0b1b88..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/vbe.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/verify.mod b/remote/modules/grub/data/etc/grub/i386-pc/verify.mod
deleted file mode 100644
index c9d8f954..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/verify.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/vga.mod b/remote/modules/grub/data/etc/grub/i386-pc/vga.mod
deleted file mode 100644
index 1a815f40..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/vga.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/vga_text.mod b/remote/modules/grub/data/etc/grub/i386-pc/vga_text.mod
deleted file mode 100644
index d5af9505..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/vga_text.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/video.lst b/remote/modules/grub/data/etc/grub/i386-pc/video.lst
deleted file mode 100644
index 6ca853e6..00000000
--- a/remote/modules/grub/data/etc/grub/i386-pc/video.lst
+++ /dev/null
@@ -1,4 +0,0 @@
-vbe
-vga
-video_bochs
-video_cirrus
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/video.mod b/remote/modules/grub/data/etc/grub/i386-pc/video.mod
deleted file mode 100644
index d3441f3f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/video.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/video_bochs.mod b/remote/modules/grub/data/etc/grub/i386-pc/video_bochs.mod
deleted file mode 100644
index 319c39ec..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/video_bochs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/video_cirrus.mod b/remote/modules/grub/data/etc/grub/i386-pc/video_cirrus.mod
deleted file mode 100644
index e0f4c0e2..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/video_cirrus.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/video_colors.mod b/remote/modules/grub/data/etc/grub/i386-pc/video_colors.mod
deleted file mode 100644
index 85feaaf3..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/video_colors.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/video_fb.mod b/remote/modules/grub/data/etc/grub/i386-pc/video_fb.mod
deleted file mode 100644
index 7c10b8fa..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/video_fb.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/videoinfo.mod b/remote/modules/grub/data/etc/grub/i386-pc/videoinfo.mod
deleted file mode 100644
index db22eaf6..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/videoinfo.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/videotest.mod b/remote/modules/grub/data/etc/grub/i386-pc/videotest.mod
deleted file mode 100644
index a582d98f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/videotest.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/videotest_checksum.mod b/remote/modules/grub/data/etc/grub/i386-pc/videotest_checksum.mod
deleted file mode 100644
index bca57a27..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/videotest_checksum.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/xfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/xfs.mod
deleted file mode 100644
index 48a3ba71..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/xfs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/xnu.mod b/remote/modules/grub/data/etc/grub/i386-pc/xnu.mod
deleted file mode 100644
index 1c00cf93..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/xnu.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid.mod b/remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid.mod
deleted file mode 100644
index 590fdea5..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid_test.mod b/remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid_test.mod
deleted file mode 100644
index bcd305f3..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/xnu_uuid_test.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/xzio.mod b/remote/modules/grub/data/etc/grub/i386-pc/xzio.mod
deleted file mode 100644
index 87994658..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/xzio.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/zfs.mod b/remote/modules/grub/data/etc/grub/i386-pc/zfs.mod
deleted file mode 100644
index 7dadca8f..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/zfs.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/zfscrypt.mod b/remote/modules/grub/data/etc/grub/i386-pc/zfscrypt.mod
deleted file mode 100644
index 2898a7be..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/zfscrypt.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/i386-pc/zfsinfo.mod b/remote/modules/grub/data/etc/grub/i386-pc/zfsinfo.mod
deleted file mode 100644
index b4db4a9e..00000000
Binary files a/remote/modules/grub/data/etc/grub/i386-pc/zfsinfo.mod and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/locale/en_AU.mo b/remote/modules/grub/data/etc/grub/locale/en_AU.mo
deleted file mode 100644
index 464f3e33..00000000
Binary files a/remote/modules/grub/data/etc/grub/locale/en_AU.mo and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/locale/en_CA.mo b/remote/modules/grub/data/etc/grub/locale/en_CA.mo
deleted file mode 100644
index 4ab757f9..00000000
Binary files a/remote/modules/grub/data/etc/grub/locale/en_CA.mo and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/locale/en_GB.mo b/remote/modules/grub/data/etc/grub/locale/en_GB.mo
deleted file mode 100644
index 31c36dab..00000000
Binary files a/remote/modules/grub/data/etc/grub/locale/en_GB.mo and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/locale/pt.mo b/remote/modules/grub/data/etc/grub/locale/pt.mo
deleted file mode 100644
index 5bc34b84..00000000
Binary files a/remote/modules/grub/data/etc/grub/locale/pt.mo and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/locale/pt_BR.mo b/remote/modules/grub/data/etc/grub/locale/pt_BR.mo
deleted file mode 100644
index 5111d77c..00000000
Binary files a/remote/modules/grub/data/etc/grub/locale/pt_BR.mo and /dev/null differ
diff --git a/remote/modules/grub/data/etc/grub/unicode.pf2 b/remote/modules/grub/data/etc/grub/unicode.pf2
deleted file mode 100644
index b87a7767..00000000
Binary files a/remote/modules/grub/data/etc/grub/unicode.pf2 and /dev/null differ
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index c9adadeb..d363db51 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -77,8 +77,10 @@ yes)
 esac
 
 [ $DEBUG -ge 4 ] && drop_shell "Requested Debug Shell: before network."
-
-. "/inc/setup_network" || . "/inc/setup_network_retry" || drop_shell "Error setting up network"
+. "/inc/setup_network"
+if [ "$?" -ne 0 -a "x$HDD" = "x" ]; then
+	. "/inc/setup_network_retry" || drop_shell "Error setting up network"
+fi
 bench_event "NETWORK" "Network up and running"
 
 [ $DEBUG -ge 3 ] && drop_shell "Requested Debug Shell: after network/before configuring."
diff --git a/server/modules/hdd-boot/opt/openslx/hdd-boot/grub.cfg b/server/modules/hdd-boot/opt/openslx/hdd-boot/grub.cfg
new file mode 100644
index 00000000..611b3785
--- /dev/null
+++ b/server/modules/hdd-boot/opt/openslx/hdd-boot/grub.cfg
@@ -0,0 +1,146 @@
+#
+# DO NOT EDIT THIS FILE
+#
+# It is automatically generated by grub-mkconfig using templates
+# from /etc/grub.d and settings from /etc/default/grub
+#
+
+### BEGIN /etc/grub.d/00_header ###
+if [ -s $prefix/grubenv ]; then
+  set have_grubenv=true
+  load_env
+fi
+if [ "${next_entry}" ] ; then
+   set default="${next_entry}"
+   set next_entry=
+   save_env next_entry
+   set boot_once=true
+else
+   set default="0"
+fi
+
+if [ x"${feature_menuentry_id}" = xy ]; then
+  menuentry_id_option="--id"
+else
+  menuentry_id_option=""
+fi
+
+export menuentry_id_option
+
+if [ "${prev_saved_entry}" ]; then
+  set saved_entry="${prev_saved_entry}"
+  save_env saved_entry
+  set prev_saved_entry=
+  save_env prev_saved_entry
+  set boot_once=true
+fi
+
+function savedefault {
+  if [ -z "${boot_once}" ]; then
+    saved_entry="${chosen}"
+    save_env saved_entry
+  fi
+}
+function recordfail {
+  set recordfail=1
+  if [ -n "${have_grubenv}" ]; then if [ -z "${boot_once}" ]; then save_env recordfail; fi; fi
+}
+function load_video {
+  if [ x$feature_all_video_module = xy ]; then
+    insmod all_video
+  else
+    insmod efi_gop
+    insmod efi_uga
+    insmod ieee1275_fb
+    insmod vbe
+    insmod vga
+    insmod video_bochs
+    insmod video_cirrus
+  fi
+}
+
+if [ x$feature_default_font_path = xy ] ; then
+   font=unicode
+else
+insmod part_msdos
+insmod lvm
+insmod ext2
+set root='lvmid/ZvOK2H-W5xA-QoO2-zy2n-Sjr7-cpu8-M3zL6F/FzLrNP-IhMk-pB8d-vEEW-Jxxk-ujc7-NWSegg'
+if [ x$feature_platform_search_hint = xy ]; then
+  search --no-floppy --fs-uuid --set=root --hint='lvmid/ZvOK2H-W5xA-QoO2-zy2n-Sjr7-cpu8-M3zL6F/FzLrNP-IhMk-pB8d-vEEW-Jxxk-ujc7-NWSegg'  0bec626d-2d44-417d-acfd-83acbbcf2b34
+else
+  search --no-floppy --fs-uuid --set=root 0bec626d-2d44-417d-acfd-83acbbcf2b34
+fi
+    font="/usr/share/grub/unicode.pf2"
+fi
+
+if loadfont $font ; then
+  set gfxmode=auto
+  load_video
+  insmod gfxterm
+  set locale_dir=$prefix/locale
+  set lang=pt_PT
+  insmod gettext
+fi
+terminal_output gfxterm
+if [ "${recordfail}" = 1 ] ; then
+  set timeout=-1
+else
+  if [ x$feature_timeout_style = xy ] ; then
+    set timeout_style=menu
+    set timeout=10
+  # Fallback normal timeout code in case the timeout_style feature is
+  # unavailable.
+  else
+    set timeout=10
+  fi
+fi
+### END /etc/grub.d/00_header ###
+
+### BEGIN /etc/grub.d/05_debian_theme ###
+set menu_color_normal=white/black
+set menu_color_highlight=black/light-gray
+### END /etc/grub.d/05_debian_theme ###
+
+### BEGIN /etc/grub.d/06_mint_theme ###
+set menu_color_normal=white/black
+set menu_color_highlight=white/light-gray
+### END /etc/grub.d/06_mint_theme ###
+
+### BEGIN /etc/grub.d/10_linux ###
+### END /etc/grub.d/10_linux ###
+
+### BEGIN /etc/grub.d/10_lupin ###
+### END /etc/grub.d/10_lupin ###
+
+### BEGIN /etc/grub.d/20_linux_xen ###
+
+### END /etc/grub.d/20_linux_xen ###
+
+### BEGIN /etc/grub.d/20_memtest86+ ###
+### END /etc/grub.d/20_memtest86+ ###
+
+### BEGIN /etc/grub.d/30_os-prober ###
+set timeout_style=menu
+if [ "${timeout}" = 0 ]; then
+  set timeout=10
+fi
+### END /etc/grub.d/30_os-prober ###
+
+### BEGIN /etc/grub.d/30_uefi-firmware ###
+### END /etc/grub.d/30_uefi-firmware ###
+
+### BEGIN /etc/grub.d/40_custom ###
+# This file provides an easy way to add custom menu entries.  Simply type the
+# menu entries you want to add after this comment.  Be careful not to change
+# the 'exec tail' line above.
+### END /etc/grub.d/40_custom ###
+
+### BEGIN /etc/grub.d/41_custom ###
+if [ -f  ${config_directory}/custom.cfg ]; then
+  source ${config_directory}/custom.cfg
+elif [ -z "${config_directory}" -a -f  $prefix/custom.cfg ]; then
+  source $prefix/custom.cfg;
+fi
+### END /etc/grub.d/41_custom ###
+
diff --git a/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot b/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot
index 5e255d46..c1c19b78 100755
--- a/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot
+++ b/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -x
 
 # Downloading all in SLX_BASE_PATH to  /boot  Example: Ubuntu_1404_x64
 # wget -N,  update if the file has been changed
@@ -27,15 +26,17 @@ for opts in ${KCL}; do
 done
 KCL=$(echo "$KCL" | sed "s|SLX_BASE_PATH|$SLX_BASE_PATH|g;s|$BOOT_IMAGE||g;s|$initrd||g")
 
-# Scan vm-store dir for vmware image xmls and copy  
+# Scan vm-store dir for vmware image xmls and copy
 if [ -d /cache/export/dnbd3 -a -d /mnt/vmstore ]; then
 	[ ! -d /boot/vmstore ] && mkdir /boot/vmstore
 	for FILE in $(find /cache/export/dnbd3 -iname "*.vmdk*" ! -iname "*map"); do
 		[ -e "${FILE}.map" ] && continue
 		image_name=$(echo $(basename "$FILE") | cut -d "." -f1)
-		for XML in $(grep -rIl --include "*.xml" "$image_name" /mnt/vmstore); do
+		cd /mnt/vmstore
+		for XML in $(grep -rIl --include "*.xml" "$image_name" .); do
 			cp $XML /boot/vmstore
 		done
+		cd -
 	done
 fi
 
@@ -55,18 +56,25 @@ BOOT_DISK=$(df | grep /boot | awk '{print $1}' | tr -d '[0-9]')
 BOOT_PART=$(df | grep /boot | awk '{print $1}' | tr -dc '[0-9]')
 [ -z "$BOOT_DISK" ] && { echo "BOOT DISK could not be found, exiting.";  exit 1; }
 
+#Check if disk is msdos or GPT
+if sgdisk $BOOT_DISK | grep -qs 'invalid GPT'; then
+	BOOT_TYPE='msdos'
+else
+	BOOT_TYPE='gpt'
+fi
+
 if [ ! -d /boot/grub ]; then
-	# First, copy from etc
-	[ -d  /etc/grub ] ||  { echo "Could not find /grub directory"; exit 1; }
-	cp -r /etc/grub /boot/
+	# First, copy grub.cfg
+	[ -e /opt/openslx/hdd-boot/grub.cfg ] && cp -r /opt/openslx/hdd-boot/grub.cfg /boot/grub/
 
 	grub-install --boot-directory=/boot $BOOT_DISK
+	update-grub-gfxpayload
+
 	RET=$?
 	[ $RET != 0 ] && { echo "Could not install GRUB";  exit 1; } ||  echo "GRUB successfully installed"
 fi
 
 #GRUB ok, so lets make the menu
-
 echo " BOOT DISK is $BOOT_DISK" #Just for test
 case $BOOT_DISK in
 	/dev/sda) GRUB_DISK=hd0 ;;
@@ -85,8 +93,8 @@ echo "GRUB_DISK $GRUB_DISK" #Just for test
 cat <<EOF >> /boot/grub/grub.cfg
 #########################
 	menuentry '$SLX_BASE_PATH' {
-	linux ($GRUB_DISK,msdos$BOOT_PART)/$SLX_BASE_PATH/kernel  hdd_boot=$BOOT_PART $KCL
-	initrd ($GRUB_DISK,msdos$BOOT_PART)/$SLX_BASE_PATH/initramfs-stage31
+	linux ($GRUB_DISK,${BOOT_TYPE}$BOOT_PART)/$SLX_BASE_PATH/kernel  hdd_boot=$BOOT_PART $KCL
+	initrd ($GRUB_DISK,${BOOT_TYPE}$BOOT_PART)/$SLX_BASE_PATH/initramfs-stage31
 }
 #########################
 EOF
-- 
cgit v1.2.3-55-g7522


From b6dfee201e2217e826551957bb5b4139f96c2b7c Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 2 Apr 2015 17:17:35 +0200
Subject: [hdd-boot] michi's werk

---
 server/configs/curitiba/cups-curitiba              |  1 -
 server/configs/curitiba/pam-curitiba               |  1 -
 .../configs/curitiba/ubuntu-13.04-pulseaudio-fix   |  1 -
 server/configs/curitiba/ubuntu-13.10-unity-fix     |  1 -
 .../opt/openslx/dnbd3-cache/alt-servers            |  2 +-
 .../hdd-boot/opt/openslx/scripts/systemd-hdd_boot  | 52 ++++++++++++----------
 6 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 120000 server/configs/curitiba/cups-curitiba
 delete mode 120000 server/configs/curitiba/pam-curitiba
 delete mode 120000 server/configs/curitiba/ubuntu-13.04-pulseaudio-fix
 delete mode 120000 server/configs/curitiba/ubuntu-13.10-unity-fix

(limited to 'server/modules')

diff --git a/server/configs/curitiba/cups-curitiba b/server/configs/curitiba/cups-curitiba
deleted file mode 120000
index 99418604..00000000
--- a/server/configs/curitiba/cups-curitiba
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/cups-curitiba/
\ No newline at end of file
diff --git a/server/configs/curitiba/pam-curitiba b/server/configs/curitiba/pam-curitiba
deleted file mode 120000
index 476a0cb2..00000000
--- a/server/configs/curitiba/pam-curitiba
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/pam-curitiba/
\ No newline at end of file
diff --git a/server/configs/curitiba/ubuntu-13.04-pulseaudio-fix b/server/configs/curitiba/ubuntu-13.04-pulseaudio-fix
deleted file mode 120000
index 92979703..00000000
--- a/server/configs/curitiba/ubuntu-13.04-pulseaudio-fix
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/ubuntu-13.04-pulseaudio-fix/
\ No newline at end of file
diff --git a/server/configs/curitiba/ubuntu-13.10-unity-fix b/server/configs/curitiba/ubuntu-13.10-unity-fix
deleted file mode 120000
index 15cde030..00000000
--- a/server/configs/curitiba/ubuntu-13.10-unity-fix
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/ubuntu-13.10-unity-fix
\ No newline at end of file
diff --git a/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/alt-servers b/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/alt-servers
index 3d9801ca..b6347315 100644
--- a/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/alt-servers
+++ b/server/modules/dnbd3-cache/opt/openslx/dnbd3-cache/alt-servers
@@ -1 +1 @@
--200.17.202.46 SLXBOX DNBD3 SERVER
+-132.230.4.1 SLXBOX DNBD3 SERVER
diff --git a/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot b/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot
index c1c19b78..f975b697 100755
--- a/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot
+++ b/server/modules/hdd-boot/opt/openslx/scripts/systemd-hdd_boot
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+set -x
 # Downloading all in SLX_BASE_PATH to  /boot  Example: Ubuntu_1404_x64
 # wget -N,  update if the file has been changed
 boot_download () {
@@ -34,9 +34,11 @@ if [ -d /cache/export/dnbd3 -a -d /mnt/vmstore ]; then
 		image_name=$(echo $(basename "$FILE") | cut -d "." -f1)
 		cd /mnt/vmstore
 		for XML in $(grep -rIl --include "*.xml" "$image_name" .); do
-			cp $XML /boot/vmstore
+			xmldir=$(dirname $XML)
+			mkdir -p /boot/vmstore/${xmldir}
+			cp $XML /boot/vmstore/${xmldir}/
 		done
-		cd -
+		cd - >/dev/null
 	done
 fi
 
@@ -47,59 +49,61 @@ if ! grep -qs '/mnt/vmstore' /proc/mounts; then
 fi
 
 # if SLX_BASE_PATH already exists, just update. Does not make the menu again.
-[ -d  /boot/$SLX_BASE_PATH ] && { boot_download; echo "$SLX_BASE_PATH updated"; exit 0; } || boot_download
+[ -d /boot/$SLX_BASE_PATH ] && { boot_download; echo "$SLX_BASE_PATH updated"; } || { boot_download; echo "New base $SLX_BASE_PATH downloaded to HDD"; }
 
 # Installing GRUB
 
 #Find disk of /boot
-BOOT_DISK=$(df | grep /boot | awk '{print $1}' | tr -d '[0-9]')
+BOOT_DISK=$(df | grep /boot | awk '{print $1}' | tr -d '[0-9]' | cut -c 6-)
 BOOT_PART=$(df | grep /boot | awk '{print $1}' | tr -dc '[0-9]')
 [ -z "$BOOT_DISK" ] && { echo "BOOT DISK could not be found, exiting.";  exit 1; }
 
 #Check if disk is msdos or GPT
-if sgdisk $BOOT_DISK | grep -qs 'invalid GPT'; then
+if sgdisk /dev/$BOOT_DISK | grep -qs 'invalid GPT'; then
 	BOOT_TYPE='msdos'
 else
 	BOOT_TYPE='gpt'
 fi
 
 if [ ! -d /boot/grub ]; then
-	# First, copy grub.cfg
-	[ -e /opt/openslx/hdd-boot/grub.cfg ] && cp -r /opt/openslx/hdd-boot/grub.cfg /boot/grub/
 
-	grub-install --boot-directory=/boot $BOOT_DISK
+	grub-install --boot-directory=/boot /dev/$BOOT_DISK
 	update-grub-gfxpayload
 
 	RET=$?
 	[ $RET != 0 ] && { echo "Could not install GRUB";  exit 1; } ||  echo "GRUB successfully installed"
+
+	# First, copy grub.cfg
+	[ -e /opt/openslx/hdd-boot/grub.cfg ] && cp -r /opt/openslx/hdd-boot/grub.cfg /boot/grub/
 fi
 
-#GRUB ok, so lets make the menu
-echo " BOOT DISK is $BOOT_DISK" #Just for test
-case $BOOT_DISK in
-	/dev/sda) GRUB_DISK=hd0 ;;
-	/dev/sdb) GRUB_DISK=hd1 ;;
-	/dev/sdc) GRUB_DISK=hd2 ;;
-	/dev/sdd) GRUB_DISK=hd3 ;;
-	/dev/sde) GRUB_DISK=hd4 ;;
-	*) echo "GRUB_DISK was not found"
+#Add new base to grub.cfg
+if ! grep -qs "menuentry '$SLX_BASE_PATH'" /boot/grub/grub.cfg; then
+
+	#GRUB ok, so lets make the menu
+	echo "BOOT DISK is $BOOT_DISK" #Just for test
+	case $BOOT_DISK in
+		sda) GRUB_DISK=hd0 ;;
+		sdb) GRUB_DISK=hd1 ;;
+		sdc) GRUB_DISK=hd2 ;;
+		sdd) GRUB_DISK=hd3 ;;
+		sde) GRUB_DISK=hd4 ;;
+		*) echo "GRUB_DISK was not found"
 		exit 1 ;;
-esac
-
-echo "GRUB_DISK $GRUB_DISK" #Just for test
+	esac
 
-[ -e  /boot/grub/grub.cfg ] ||  { echo "Could not find grub.cfg"; exit 1; }
+	[ -e  /boot/grub/grub.cfg ] ||  { echo "Could not find grub.cfg"; exit 1; }
 
 cat <<EOF >> /boot/grub/grub.cfg
 #########################
 	menuentry '$SLX_BASE_PATH' {
-	linux ($GRUB_DISK,${BOOT_TYPE}$BOOT_PART)/$SLX_BASE_PATH/kernel  hdd_boot=$BOOT_PART $KCL
+	linux ($GRUB_DISK,${BOOT_TYPE}$BOOT_PART)/$SLX_BASE_PATH/kernel  hdd_boot=${BOOT_DISK}$BOOT_PART $KCL
 	initrd ($GRUB_DISK,${BOOT_TYPE}$BOOT_PART)/$SLX_BASE_PATH/initramfs-stage31
 }
 #########################
 EOF
 
-echo "GRUB INSTALLED =) =)"
+fi
 
 true
 
-- 
cgit v1.2.3-55-g7522