Merge pull request #332 from mariux64/etc-files-reorg

Etc files reorg
mariux64 · Jul 7, 2023 · f9949de · f9949de
2 parents ed1e0a0 + 96c17c9
commit f9949de
Show file tree

Hide file tree

Showing 40 changed files with 10 additions and 45 deletions.
diff --git a/misc_etc_files/autofs.conf → etc/autofs.conf b/misc_etc_files/autofs.conf → etc/autofs.conf
diff --git a/misc_etc_files/cups/client.conf → etc/cups/client.conf b/misc_etc_files/cups/client.conf → etc/cups/client.conf
diff --git a/misc_etc_files/modprobe.d/disable-i915.conf → etc/modprobe.d/disable-i915.conf b/misc_etc_files/modprobe.d/disable-i915.conf → etc/modprobe.d/disable-i915.conf
diff --git a/misc_etc_files/modprobe.d/ixgbe_sfp.conf → etc/modprobe.d/ixgbe_sfp.conf b/misc_etc_files/modprobe.d/ixgbe_sfp.conf → etc/modprobe.d/ixgbe_sfp.conf
diff --git a/misc_etc_files/modprobe.d/nfs_slotlimit.conf → etc/modprobe.d/nfs_slotlimit.conf b/misc_etc_files/modprobe.d/nfs_slotlimit.conf → etc/modprobe.d/nfs_slotlimit.conf
diff --git a/misc_etc_files/msmtprc → etc/msmtprc b/misc_etc_files/msmtprc → etc/msmtprc
diff --git a/misc_etc_files/mxq/gpu-policy → etc/mxq/gpu-policy b/misc_etc_files/mxq/gpu-policy → etc/mxq/gpu-policy
diff --git a/misc_etc_files/nsswitch.conf → etc/nsswitch.conf b/misc_etc_files/nsswitch.conf → etc/nsswitch.conf
diff --git a/misc_etc_files/os-release → etc/os-release b/misc_etc_files/os-release → etc/os-release
diff --git a/..._etc_files/request-key.d/id_resolver.conf → etc/request-key.d/id_resolver.conf b/..._etc_files/request-key.d/id_resolver.conf → etc/request-key.d/id_resolver.conf
diff --git a/misc_etc_files/rsyslog.conf → etc/rsyslog.conf b/misc_etc_files/rsyslog.conf → etc/rsyslog.conf
diff --git a/misc_etc_files/sysctl.conf → etc/sysctl.conf b/misc_etc_files/sysctl.conf → etc/sysctl.conf
diff --git a/...temd/logind.conf.d/disable_RemoveIPC.conf → ...temd/logind.conf.d/disable_RemoveIPC.conf b/...temd/logind.conf.d/disable_RemoveIPC.conf → ...temd/logind.conf.d/disable_RemoveIPC.conf
diff --git a/misc_systemd_units/admin-sshd.service → etc/systemd/system/admin-sshd.service b/misc_systemd_units/admin-sshd.service → etc/systemd/system/admin-sshd.service
diff --git a/misc_systemd_units/automount.service → etc/systemd/system/automount.service b/misc_systemd_units/automount.service → etc/systemd/system/automount.service
diff --git a/misc_systemd_units/baucamhttpd.service → etc/systemd/system/baucamhttpd.service b/misc_systemd_units/baucamhttpd.service → etc/systemd/system/baucamhttpd.service
diff --git a/...md_units/enable_overcommit_memory.service → ...d/system/enable_overcommit_memory.service b/...md_units/enable_overcommit_memory.service → ...d/system/enable_overcommit_memory.service
diff --git a/misc_systemd_units/eturnal.service → etc/systemd/system/eturnal.service b/misc_systemd_units/eturnal.service → etc/systemd/system/eturnal.service
diff --git a/misc_systemd_units/getcams.service → etc/systemd/system/getcams.service b/misc_systemd_units/getcams.service → etc/systemd/system/getcams.service
diff --git a/misc_systemd_units/i915.service → etc/systemd/system/i915.service b/misc_systemd_units/i915.service → etc/systemd/system/i915.service
diff --git a/misc_systemd_units/ip6.service → etc/systemd/system/ip6.service b/misc_systemd_units/ip6.service → etc/systemd/system/ip6.service
diff --git a/misc_systemd_units/lightdm.service → etc/systemd/system/lightdm.service b/misc_systemd_units/lightdm.service → etc/systemd/system/lightdm.service
diff --git a/misc_systemd_units/mxvlan.service → etc/systemd/system/mxvlan.service b/misc_systemd_units/mxvlan.service → etc/systemd/system/mxvlan.service
diff --git a/misc_systemd_units/named.service → etc/systemd/system/named.service b/misc_systemd_units/named.service → etc/systemd/system/named.service
diff --git a/misc_systemd_units/network.service → etc/systemd/system/network.service b/misc_systemd_units/network.service → etc/systemd/system/network.service
diff --git a/misc_systemd_units/nfsd.service → etc/systemd/system/nfsd.service b/misc_systemd_units/nfsd.service → etc/systemd/system/nfsd.service
diff --git a/misc_systemd_units/pacbio-sshd.service → etc/systemd/system/pacbio-sshd.service b/misc_systemd_units/pacbio-sshd.service → etc/systemd/system/pacbio-sshd.service
diff --git a/misc_systemd_units/reboot-notify.service → etc/systemd/system/reboot-notify.service b/misc_systemd_units/reboot-notify.service → etc/systemd/system/reboot-notify.service
diff --git a/misc_systemd_units/sshd.service → etc/systemd/system/sshd.service b/misc_systemd_units/sshd.service → etc/systemd/system/sshd.service
diff --git a/misc_systemd_units/startup-tags.service → etc/systemd/system/startup-tags.service b/misc_systemd_units/startup-tags.service → etc/systemd/system/startup-tags.service
diff --git a/...er@.service.d/depend-on-remote-homes.conf → ...er@.service.d/depend-on-remote-homes.conf b/...er@.service.d/depend-on-remote-homes.conf → ...er@.service.d/depend-on-remote-homes.conf
diff --git a/...systemd_units/wait-network-online.service → ...ystemd/system/wait-network-online.service b/...systemd_units/wait-network-online.service → ...ystemd/system/wait-network-online.service
diff --git a/..._files/udev/rules.d/10-ioschedulers.rules → etc/udev/rules.d/10-ioschedulers.rules b/..._files/udev/rules.d/10-ioschedulers.rules → etc/udev/rules.d/10-ioschedulers.rules
diff --git a/misc_etc_files/unbound/root.key → etc/unbound/root.key b/misc_etc_files/unbound/root.key → etc/unbound/root.key
diff --git a/misc_etc_files/unbound/unbound.conf → etc/unbound/unbound.conf b/misc_etc_files/unbound/unbound.conf → etc/unbound/unbound.conf
diff --git a/install.sh b/install.sh
@@ -101,6 +101,13 @@ function install_symlink()
     register_installed_file "$2"
 }
 
+function install_etc_files()
+{
+    (cd etc ; find * -type f) | while read -r path; do
+        install_data etc/$path "$DESTDIR$sysconfdir/$path"
+    done
+}
+
 function postinstall()
 {
     update-desktop-database "$DESTDIR$desktopdir"
@@ -119,12 +126,10 @@ function postinstall()
 
 umask 022;
 
+install_etc_files
 install_exec make-automaps/make-automaps                 "$DESTDIR$usr_sbindir/make-automaps"
-install_data misc_systemd_units/automount.service        "$DESTDIR$systemdunitdir/automount.service"
-install_data misc_systemd_units/enable_overcommit_memory.service "$DESTDIR$systemdunitdir/enable_overcommit_memory.service"
-install_data misc_systemd_units/startup-tags.service     "$DESTDIR$systemdunitdir/startup-tags.service"
-install_data misc_systemd_units/unbound.service          "$DESTDIR$systemdunitdir/unbound.service"
-install_exec misc_systemd_units/unbound-startup          "$DESTDIR$usr_sbindir/unbound-startup"
+install_data unbound/unbound.service                     "$DESTDIR$systemdunitdir/unbound.service"
+install_exec unbound/unbound-startup                     "$DESTDIR$usr_sbindir/unbound-startup"
 install_exec mkmotd/mkmotd.pl                            "$DESTDIR$usr_sbindir/mkmotd.pl"
 install_data mkmotd/motd.service                         "$DESTDIR$systemdunitdir/motd.service"
 install_exec mxgrub/mxgrub                               "$DESTDIR$usr_sbindir/mxgrub"
@@ -152,10 +157,6 @@ install_cron mxraid/crond-mdcheck                        "$DESTDIR$crond_dir/mdc
 install_exec kvm_monitor/kvm_monitor.pl                  "$DESTDIR$udev_helperdir/kvm_monitor.pl"
 install_data kvm_monitor/51-raritan-kvm.rules            "$DESTDIR$udev_rulesdir/51-raritan-kvm.rules"
 install_exec mxmirror/mxmirror                           "$DESTDIR$usr_sbindir/mxmirror"
-install_data misc_systemd_units/named.service            "$DESTDIR$systemdunitdir/named.service"
-install_data misc_systemd_units/baucamhttpd.service      "$DESTDIR$systemdunitdir/baucamhttpd.service"
-install_data misc_systemd_units/getcams.service          "$DESTDIR$systemdunitdir/getcams.service"
-install_data misc_systemd_units/eturnal.service          "$DESTDIR$systemdunitdir/eturnal.service"
 install_exec blink/blinkd.py                             "$DESTDUR$udev_helperdir/blinkd.py"
 install_data blink/blinkd.service                        "$DESTDIR$systemdunitdir/blinkd.service"
 install_data blink/51-blink.rules                        "$DESTDIR$udev_rulesdir/51-blink.rules"
@@ -170,22 +171,12 @@ install_exec fon/fon.pl                                  "$DESTDIR$usr_bindir/fo
 install_exec nfsdtop/nfsdtop                             "$DESTDIR$usr_sbindir/nfsdtop"
 install_data serial-log/serial-log\@.service             "$DESTDIR$systemdunitdir/serial-log@.service"
 install_exec serial-log/serial-log                       "$DESTDIR$usr_exec_prefix/libexec/serial-log"
-install_data misc_systemd_units/nfsd.service             "$DESTDIR$systemdunitdir/nfsd.service"
-install_data misc_systemd_units/user@.service.d/depend-on-remote-homes.conf \
-                                                         "$DESTDIR$systemdunitdir/user@.service.d/depend-on-remote-homes.conf"
-install_data misc_etc_files/systemd/logind.conf.d/disable_RemoveIPC.conf \
-                                                          "$DESTDIR$sysconfdir/systemd/logind.conf.d/disable_RemoveIPC.conf"
 install_data logrotate/logrotate.conf                     "$DESTDIR$sysconfdir/logrotate.conf"
 install_data logrotate/logrotate.service                  "$DESTDIR$systemdunitdir/logrotate.service"
 install_data logrotate/logrotate.timer                    "$DESTDIR$systemdunitdir/logrotate.timer"
-install_data misc_systemd_units/network.service           "$DESTDIR$systemdunitdir/network.service"
-install_data misc_systemd_units/mxvlan.service            "$DESTDIR$systemdunitdir/mxvlan.service"
 install_data applications-defaults/defaults.list          "$DESTDIR$usr_prefix/share/applications/defaults.list"
-install_data misc_etc_files/modprobe.d/nfs_slotlimit.conf "$DESTDIR$sysconfdir/modprobe.d/nfs_slotlimit.conf"
-install_data misc_etc_files/rsyslog.conf                  "$DESTDIR$sysconfdir/rsyslog.conf"
 install_data crashkernel/crashkernel.service              "$DESTDIR$systemdunitdir/crashkernel.service"
 install_exec crashkernel/crash-recovery.sh                "$DESTDIR$root_sbindir/crash-recovery.sh"
-install_data misc_systemd_units/admin-sshd.service        "$DESTDIR$systemdunitdir/admin-sshd.service"
 install_exec checktrust/checktrust                        "$DESTDIR$usr_sbindir/checktrust"
 install_data checktrust/lightdm-use-wrapper.conf          "$DESTDIR$sysconfdir/xdg/lightdm/lightdm.conf.d/50-use-wrapper.conf"
 install_exec checktrust/lightdm-greeter-wrapper           "$DESTDIR$usr_exec_prefix/libexec/lightdm-greeter-wrapper"
@@ -209,17 +200,10 @@ done
 install_symlink /usr/bin/prun                             "$DESTDIR$usrlocal_prefix/package/bin/prun"
 install_symlink /usr/bin/ptype                            "$DESTDIR$usrlocal_prefix/package/bin/ptype"
 install_symlink /usr/bin/pman                             "$DESTDIR$usrlocal_prefix/package/bin/pman"
-install_data misc_etc_files/sysctl.conf                   "$DESTDIR$sysconfdir/sysctl.conf"
-install_data misc_systemd_units/reboot-notify.service     "$DESTDIR$systemdunitdir/reboot-notify.service"
-install_data misc_etc_files/autofs.conf                   "$DESTDIR$sysconfdir/autofs.conf"
-install_data misc_etc_files/msmtprc                       "$DESTDIR$sysconfdir/msmtprc"
-install_data misc_etc_files/unbound/unbound.conf          "$DESTDIR$sysconfdir/unbound/unbound.conf"
-install_data misc_etc_files/unbound/root.key              "$DESTDIR$sysconfdir/unbound/root.key"
 install_exec wakeonlan/wakeonlan                          "$DESTDIR$usr_sbindir/wakeonlan"
 install_data mxshadow/mxshadow.cert.pem                   "$DESTDIR$sysconfdir/mxshadow.cert.pem"
 install_data mxshadow/mxshadow.conf                       "$DESTDIR$sysconfdir/mxshadow.conf"
 install_data mxshadow/mxshadow.service                    "$DESTDIR$systemdunitdir/mxshadow.service"
-install_data misc_etc_files/nsswitch.conf                 "$DESTDIR$sysconfdir/nsswitch.conf"
 install_exec vmcontrol/vmcontrol.pl                       "$DESTDIR$usr_bindir/vmcontrol.pl"
 install_data prun/prun.1                                  "$DESTDIR$usr_mandir/man1/prun.1"
 install_data prun/ptype.1                                 "$DESTDIR$usr_mandir/man1/ptype.1"
@@ -236,43 +220,26 @@ install_data mxproxmox/proxmox-backup.timer               "$DESTDIR$systemdunitd
 install_exec kill-exuser/kill-exuser                      "$DESTDIR$usr_sbindir/kill-exuser"
 install_data kill-exuser/kill-exuser.service              "$DESTDIR$systemdunitdir/kill-exuser.service"
 install_data kill-exuser/kill-exuser.timer                "$DESTDIR$systemdunitdir/kill-exuser.timer"
-install_data misc_etc_files/udev/rules.d/10-ioschedulers.rules \
-                                                          "$DESTDIR$sysconfdir/udev/rules.d/10-ioschedulers.rules"
 install_data slowio/slowio.slice                          "$DESTDIR$systemdunitdir/slowio.slice"
 install_exec slowio/slowio-mem-control                    "$DESTDIR$sysconfdir/systemd/system-generators/slowio-mem-control"
 install_exec slowio/slowio                                "$DESTDIR$usr_sbindir/slowio"
-install_exec misc_etc_files/mxq/gpu-policy                "$DESTDIR$sysconfdir/mxq/gpu-policy"
-install_data misc_etc_files/os-release                    "$DESTDIR$sysconfdir/os-release"
 install_exec forensics/forensics                          "$DESTDIR$usr_sbindir/forensics"
 install_exec forensics/forensicsd                         "$DESTDIR$usr_sbindir/forensicsd"
 install_data forensics/forensicsd.service                 "$DESTDIR$systemdunitdir/forensicsd.service"
 install_data forensics/forensicsd.timer                   "$DESTDIR$systemdunitdir/forensicsd.timer"
-install_data misc_etc_files/modprobe.d/ixgbe_sfp.conf     "$DESTDIR$sysconfdir/modprobe.d/ixgbe_sfp.conf"
 install_exec forensics/mxvmem                             "$DESTDIR$usr_bindir/mxvmem"
-install_data misc_systemd_units/sshd.service              "$DESTDIR$systemdunitdir/sshd.service"
-install_data misc_systemd_units/pacbio-sshd.service       "$DESTDIR$systemdunitdir/pacbio-sshd.service"
 for f in libexec_cron/*; do
     install_exec "$f"                                     "$DESTDIR$usr_exec_prefix/libexec/cron/$(basename "$f")"
 done
 for f in libexec_startup/*; do
     install_exec "$f"                                     "$DESTDIR$usr_exec_prefix/libexec/startup/$(basename "$f")"
 done
-install_data misc_etc_files/request-key.d/id_resolver.conf \
-                                                          "$DESTDIR$sysconfdir/request-key.d/id_resolver.conf"
 install_symlink /etc/local/access.conf                    "$DESTDIR$sysconfdir/security/access.conf"
-install_data misc_etc_files/cups/client.conf              "$DESTDIR$sysconfdir/cups/client.conf"
-install_data misc_systemd_units/ip6.service               "$DESTDIR$systemdunitdir/ip6.service"
-install_data mxrouter/mxrouter.service                    "$DESTDIR$systemdunitdir/mxrouter.service"
-install_data misc_systemd_units/wait-network-online.service \
-                                                          "$DESTDIR$systemdunitdir/wait-network-online.service"
-install_data misc_etc_files/modprobe.d/disable-i915.conf  "$DESTDIR$sysconfdir/modprobe.d/disable-i915.conf"
-install_data misc_systemd_units/i915.service              "$DESTDIR$systemdunitdir/i915.service"
 install_exec mxstartup/mxservicectl                       "$DESTDIR$usr_sbindir/mxservicectl"
 install_exec mxstartup/mxstartup2mxconfig                 "$DESTDIR$usr_sbindir/mxstartup2mxconfig"
 install_exec mxstartup/mxstartupctl                       "$DESTDIR$usr_sbindir/mxstartupctl"
 install_exec mxstartup/mxvipctl                           "$DESTDIR$usr_sbindir/mxvipctl"
 install_data mxstartup/mxstartup.service                  "$DESTDIR$systemdunitdir/mxstartup.service"
-install_data misc_systemd_units/lightdm.service           "$DESTDIR$systemdunitdir/lightdm.service"
 install_data pdist/pdistd.socket                          "$DESTDIR$systemdunitdir/pdistd.socket"
 install_data pdist/pdistd@.service                        "$DESTDIR$systemdunitdir/pdistd@.service"
 install_exec pdist/pdist-bootcheck                        "$DESTDIR$usr_exec_prefix/libexec/pdist-bootcheck"

diff --git a/misc_systemd_units/unbound-startup → unbound/unbound-startup b/misc_systemd_units/unbound-startup → unbound/unbound-startup
diff --git a/misc_systemd_units/unbound.service → unbound/unbound.service b/misc_systemd_units/unbound.service → unbound/unbound.service
diff --git a/usrlocalpkg/admin/lib/jdk-7.profile b/usrlocalpkg/admin/lib/jdk-7.profile
diff --git a/usrlocalpkg/admin/lib/jdk-7u80.profile b/usrlocalpkg/admin/lib/jdk-7u80.profile