Commit ebf964bd authored by Christopher Spinrath's avatar Christopher Spinrath

Merge branch 'master' into copying

scripts/remaster*: The set -e conflicted with the copying header; inserted both in the correct order.
config/: use the new default git location from master

Conflicts:
	config/Makefile.conf.defaults
	scripts/remaster_iso.sh
	scripts/remaster_rootfs.sh
parents ed5177ac 232598cf
......@@ -271,6 +271,7 @@ image_binary_files $(IMAGE_DIR)/.lipbinaries: image_git_pull $(IMAGE_BINARIES)
"$(IMAGE_DIR)/"
$(RSYNC) "$(SECONDARY_ARCH_DIR)$(ISO_CONTENT)/.disk/casper-uuid-generic" "$(IMAGE_DIR)/.disk/casper-uuid-generic-$(SECONDARY_ARCH)"
$(RSYNC) "$(PRIMARY_ARCH_DIR)$(ISO_CONTENT)/EFI/BOOT/BOOTx64.EFI" "$(IMAGE_DIR)/efi/boot/"
$(RSYNC) "$(PRIMARY_ARCH_DIR)$(ISO_CONTENT)/EFI/BOOT/grubx64.efi" "$(IMAGE_DIR)/efi/boot/"
mkdir -p "$(IMAGE_DIR)/casper"
$(RSYNC) --progress "$(COMMON_DIR)/lip-common.squashfs" \
"$(COMMON_DIR)/lip-$(PRIMARY_ARCH).squashfs" \
......
......@@ -25,5 +25,5 @@ ISO_RELEASE=trusty
ISO_VERSION=14.04.1
ISO_FLAVOR=kubuntu
IMAGE_GIT_URL=https://learninglinux.fsmpi.rwth-aachen.de/git/lipstick.git
IMAGE_GIT_URL=https://www.fsmpi.rwth-aachen.de/git/lipstick
IMAGE_GIT_BRANCH=ws14
......@@ -2,5 +2,5 @@ deb http://ftp.halifax.rwth-aachen.de/ubuntu/ trusty main restricted universe mu
deb http://security.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse
deb http://ftp.halifax.rwth-aachen.de/ubuntu/ trusty-updates main restricted universe multiverse
#deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe multiverse
#deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe multiverse
#deb http://de.archive.ubuntu.com/ubuntu/ trusty main restricted universe multiverse
#deb http://de.archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe multiverse
......@@ -29,6 +29,7 @@ network-manager-vpnc
vim
htop
git
gparted
#texlive
chktex
......
......@@ -17,6 +17,8 @@
# You should have received a copy of the GNU General Public License
# along with lipck. If not, see <http://www.gnu.org/licenses/>.
set -e
SCRIPT_DIR="$1"
IRD="$2"
ROOTFS="$3"
......
......@@ -17,6 +17,8 @@
# You should have received a copy of the GNU General Public License
# along with lipck. If not, see <http://www.gnu.org/licenses/>.
set -e
SCRIPT_DIR="$1"
ISO_REMASTER_DIR="$2"
......
......@@ -36,6 +36,8 @@
# along with UCK. If not, see <http://www.gnu.org/licenses/>. #
###################################################################################
set -e
SCRIPT_DIR="/remaster"
CONTRIB_DIR="$SCRIPT_DIR/contrib/"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment