From d6f1e2d7a5aa54e9247b8e50f993685a458e4833 Mon Sep 17 00:00:00 2001
From: Christopher Spinrath <christopher.spinrath@rwth-aachen.de>
Date: Sun, 1 Mar 2015 16:04:54 +0100
Subject: [PATCH] Renamed remaining bash scripts to their corr. Makefile target
---
Makefile | 6 +++---
scripts/{fill_offline_repo.sh => repo_packages.sh} | 0
scripts/{remaster_rootfs.sh => rootfs_remaster.sh} | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename scripts/{fill_offline_repo.sh => repo_packages.sh} (100%)
rename scripts/{remaster_rootfs.sh => rootfs_remaster.sh} (100%)
diff --git a/Makefile b/Makefile
index 5d70082..ce0764f 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,7 @@ $(call gentargets,$(STATE_DIR)/rootfs_remastered) : $(call archdir,%)$(STATE_DIR
-s lxc.mount.entry="$(APT_CACHE_DIR) $(call archdir,$*)$(ROOTFS)/var/cache/apt/ none defaults,bind 0 0" \
-s lxc.mount.entry="none $(call archdir,$*)$(ROOTFS)/tmp tmpfs defaults 0 0" \
-s lxc.mount.entry="none $(call archdir,$*)$(ROOTFS)/run tmpfs defaults 0 0" \
- -- /bin/bash -l /remaster/remaster.proxy.sh /remaster/scripts/remaster_rootfs.sh
+ -- /bin/bash -l /remaster/remaster.proxy.sh /remaster/scripts/rootfs_remaster.sh
$(MAKE) ARCH=$* rootfs_finalize
#apply patches
@@ -376,7 +376,7 @@ image : image_content
repo_packages : $(REPO_ARCHIVE_DIR)/Packages.$(call altarch,$(ARCH))
$(REPO_ARCHIVE_DIR)/Packages.$(call altarch,$(PRIMARY_ARCH)) $(REPO_ARCHIVE_DIR)/Packages.$(call altarch,$(SECONDARY_ARCH)) : $(REPO_ARCHIVE_DIR)/Packages.% : $(call archdir,$*)$(STATE_DIR)/rootfs_remastered | $(IMAGE_DIR)
$(MAKE) ARCH=$(call to_arch,$*) rootfs_prepare
- mkdir "$(call archdir,$*)$(ROOTFS)/cdrom"
+ mkdir -p "$(call archdir,$*)$(ROOTFS)/cdrom"
mkdir -p "$(call archdir,$*)$(LXC_DIR)"
lxc-execute --name "lipck_remaster_$*" -P "$(call archdir,$*)$(LXC_DIR)" -f "$(CURDIR)/config/lxc_common.conf" \
-s lxc.arch="$(call to_arch,$*)" -s lxc.rootfs="$(call archdir,$*)$(ROOTFS)" \
@@ -385,7 +385,7 @@ $(REPO_ARCHIVE_DIR)/Packages.$(call altarch,$(PRIMARY_ARCH)) $(REPO_ARCHIVE_DIR)
-s lxc.mount.entry="none $(call archdir,$(ARCH))$(ROOTFS)/run tmpfs defaults 0 0" \
-s lxc.mount.entry="$(IMAGE_DIR) $(call archdir,$*)$(ROOTFS)/cdrom none defaults,bind 0 0" \
-- /bin/bash -l /remaster/remaster.proxy.sh \
- /remaster/scripts/fill_offline_repo.sh "$*" "/cdrom"
+ /remaster/scripts/repo_packages.sh "$*" "/cdrom"
rmdir "$(call archdir,$*)$(ROOTFS)/cdrom"
$(MAKE) ARCH=$(call to_arch,$*) rootfs_finalize
diff --git a/scripts/fill_offline_repo.sh b/scripts/repo_packages.sh
similarity index 100%
rename from scripts/fill_offline_repo.sh
rename to scripts/repo_packages.sh
diff --git a/scripts/remaster_rootfs.sh b/scripts/rootfs_remaster.sh
similarity index 100%
rename from scripts/remaster_rootfs.sh
rename to scripts/rootfs_remaster.sh
--
GitLab