Move some settings from builder/squash to install/merge.

14 years ago · 428a37c0c0
parent bf3ae795be
commit 428a37c0c0
24 changed files with 3 additions and 15 deletions
--- a/builder/squash/acpid/.calculate_directory
+++ b/builder/squash/acpid/.calculate_directory
@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(sys-power/acpid)!= path=/etc name=acpi
-
--- a/builder/squash/acpid/default/acpid
+++ b/builder/squash/acpid/default/acpid
@ -1 +0,0 @@
-# Calculate link=/etc/init.d/acpid symbolic
--- a/builder/squash/baselayout/.calculate_directory
+++ b/builder/squash/baselayout/.calculate_directory
@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(sys-apps/baselayout)!= name=etc
-
--- a/builder/squash/calculate-install/boot/.calculate_directory
+++ b/builder/squash/calculate-install/boot/.calculate_directory
@ -1,2 +0,0 @@
-# Calculate path=/etc/runlevels
-
--- a/builder/squash/clamav/.calculate_directory
+++ b/builder/squash/clamav/.calculate_directory
@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(app-antivirus/clamav)!= append=skip
-
--- a/builder/squash/clamav/clamav/.calculate_directory
+++ b/builder/squash/clamav/clamav/.calculate_directory
@ -1 +0,0 @@
-# Calculate path=/var/log append=clear
--- a/builder/squash/baselayout/conf.d/hostname
+++ b/builder/squash/baselayout/conf.d/hostname
--- a/builder/squash/baselayout/conf.d/hwclock
+++ b/builder/squash/baselayout/conf.d/hwclock
--- a/builder/squash/baselayout/fstab
+++ b/builder/squash/baselayout/fstab
--- a/builder/squash/sysvinit/inittab
+++ b/builder/squash/sysvinit/inittab
--- a/builder/squash/baselayout/mtab
+++ b/builder/squash/baselayout/mtab
--- a/builder/squash/portage/.calculate_directory
+++ b/builder/squash/portage/.calculate_directory
@ -1,2 +1 @@
-# Calculate belong()!=&&pkg(sys-apps/portage)!=&&os_builder_linux_system!= path=/var/lib name=portage
-
+# Calculate os_builder_linux_system!= path=/var/lib
--- a/builder/squash/sysvinit/.calculate_directory
+++ b/builder/squash/sysvinit/.calculate_directory
@ -1,2 +0,0 @@
-# Calculate belong()!=&&pkg(sys-apps/sysvinit)!= append=skip path=/ name=etc
-
--- a/install/merge/acpid/default/acpid
+++ b/install/merge/acpid/default/acpid
@ -1 +1 @@
-# Calculate append=remove hr_laptop==
+# Calculate link=/etc/init.d/acpid symbolic cl_laptop!=||cl_chroot_status!=off
--- a/install/merge/acpid/default/acpid.remove
+++ b/install/merge/acpid/default/acpid.remove
@ -0,0 +1 @@
+# Calculate append=remove name=acpid hr_laptop==&&cl_chroot_status!=on
--- a/builder/squash/calculate-builder/.calculate_directory
+++ b/builder/squash/calculate-builder/.calculate_directory
--- a/builder/squash/calculate-builder/boot/calculate-builder
+++ b/builder/squash/calculate-builder/boot/calculate-builder
--- a/builder/squash/calculate-install/.calculate_directory
+++ b/builder/squash/calculate-install/.calculate_directory
--- a/install/merge/calculate-install/boot/.calculate_directory
+++ b/install/merge/calculate-install/boot/.calculate_directory
--- a/builder/squash/calculate-install/boot/calculate
+++ b/builder/squash/calculate-install/boot/calculate
--- a/builder/squash/calculate-sources/.calculate_directory
+++ b/builder/squash/calculate-sources/.calculate_directory
--- a/builder/squash/calculate-sources/modprobe_i915.conf
+++ b/builder/squash/calculate-sources/modprobe_i915.conf
--- a/builder/squash/cpufrequtils/.calculate_directory
+++ b/builder/squash/cpufrequtils/.calculate_directory
--- a/builder/squash/cpufrequtils/boot/cpufrequtils
+++ b/builder/squash/cpufrequtils/boot/cpufrequtils
				`@ -1,2 +0,0 @@`
				`# Calculate belong()!=&&pkg(sys-power/acpid)!= path=/etc name=acpi`
				`@ -1,2 +0,0 @@`
				`# Calculate belong()!=&&pkg(sys-apps/baselayout)!= name=etc`
				`@ -1,2 +0,0 @@`
				`# Calculate belong()!=&&pkg(app-antivirus/clamav)!= append=skip`
				`@ -1,2 +0,0 @@`
				`# Calculate belong()!=&&pkg(sys-apps/sysvinit)!= append=skip path=/ name=etc`
				`@ -0,0 +1 @@`
				`# Calculate append=remove name=acpid hr_laptop==&&cl_chroot_status!=on`