Save point trying to fix the /etc overwrite problem

pkgsum

@@ -0,0 +1,89 @@
+91d3d1cecbe0122e4072b4e3758318a81c29cebe6acf4e817be54df84e29e2d1  ./etc/adduser.conf
+29128d49b590338131373ec431a59c0b5318330050aac9ac61d5098517ac9a25  ./etc/bash.bashrc
+8decc28095dd6363ed1cf1cc7ef046b04064daf96d3d0a8fbcf5af234dcfefe6  ./etc/bash_completion
+63229551ffc257f56e3df60ca97e1f2963f3ab2128ce27a0f398b4418fa454d0  ./etc/bindresvport.blacklist
+ecf9a0fc70ea659406fc1d47ea78b27563f133b0a0ec5a15305c4196303ac216  ./etc/ca-certificates.conf
+cef318c4162933d8c86d243b235131f10cc98b558f3807a6ea697513c95aaf08  ./etc/ca-certificates.conf.dpkg-old
+3494e2d3ce0fb77633d00b247cad543cca29c7673da802a23bd5fe0364eb2c13  ./etc/crontab
+d49b1e746f6c62f3f4748f8b97793ceef7b8e21cfd240ce7d77bcf527d39adfa  ./etc/crypttab
+fe7e76d4162e80e0bc8c24bc638c56ae92c07a80db750cbf0a87e0904e143f4e  ./etc/debconf.conf
+2314db8908ad34e40020605e91d4567233013838b88e071b9278110c12d065bb  ./etc/debian_version
+946e0f11a8997bf41dbafca1f6f5a4bedf46746c91801ca4f2e90dd0172f06b6  ./etc/deluser.conf
+461e21f3dc1a5f9f3fe7c4e425c93de09fe11e77f5be67b719c81c5b2202ce53  ./etc/e2scrub.conf
+c23d36f4eb3691dd1b5ae7e74891242c5fdfed4e4cfb5421a4f51f67bbc80528  ./etc/ec2_version
+3d88795b8d42b87bbbf91f8d30dae43b6db9ecd4b1eb93a883062352c902ff5d  ./etc/environment
+7ef160dfc382b5f927dfb41ceea369936239632d2990dba18fdf6737cc6a5220  ./etc/ethertypes
+66bc37972ee65b83fa0ea301d7c51584db9955542467b4529197fb440f76a59f  ./etc/fstab
+024aa16852bdbecfe3b828c7c5f7baf2db51fae72ddcd488445b99331aafebed  ./etc/fuse.conf
+76a5771adee7b9f36c7ae66eae78d72f325557500269107f2d98a7e3560a1808  ./etc/gai.conf
+b0a022f9dc60aa446e4e675b1c1086b391f9a89942a190ee847712e49d694b10  ./etc/group
+17284df512e48ee507ad804b20a42eee5f298c6fe34728a5921d9f9f7aff984f  ./etc/group-
+018eaab7c48f2282c00c62c31f56d1df1db4216cc88881b75320c1be7e3f812e  ./etc/gshadow
+9f95cf4494e1e09c8d30d4557686f13cf504de3fb01f94cd53d6c5317227eedb  ./etc/gshadow-
+d149ef8ead4b03c8f635091f4b44e04161f4d85aea925334a902b953abca21ab  ./etc/hdparm.conf
+02a6e65b457fb589ef212bb09b2a985b7181987b3e8782fd9be81abead1c776d  ./etc/host.conf
+da4d47d486c674b0e05b992713276b345aaa1858d3f147b4b185ad5215cfdc69  ./etc/hostname
+51c9f3e35dbb6c9616355933bdd01ad42470fc799e420c0283afe1b57c72bb4d  ./etc/hosts
+9eadbcd7ec16f4e5961ad2035c0228de7c22b2ba0f6761df63b1b3d9bad9d0a7  ./etc/hosts.allow
+1d0a326106184ef6c389d685e061ba7737de6f7f60c600ec66b19682c53c08d1  ./etc/hosts.deny
+1372f6d69c3638d63724c6daecf339c82bb9520a77ead2d497cb66e7114e62bb  ./etc/inputrc
+fc10db4a27ce72a9bd580c195634c0b3d0be034da84db2c3fb4c38fb41b6e8e8  ./etc/issue
+3ba0e1730f2a3cfdac17a5ff84dcd17059c051b48fa43c1752bff0ac6ed9a78f  ./etc/issue.net
+521f6735c541180b5d0da27bc6702f60911ddf1590eb44e2e0f624ebd248421f  ./etc/kernel-img.conf
+c44141072dbf4fda522e7f6a237bf1acce2236f9d5b366cfe23f84dd9821a3f2  ./etc/ld.so.cache
+d4b198c463418b493208485def26a6f4c57279467b9dfa491b70433cedb602e8  ./etc/ld.so.conf
+9fa4ad4d7c2a346540c64c4c3619e389db894116f99a0fbbcc75a58bf2851262  ./etc/legal
+d48318c90620fde96cb6a8e6eb1eb64663b21200f9d1d053f9e3b4fce24a2543  ./etc/libaudit.conf
+8138bbaea6a31dbcd47cca87d5f0a30980d352888374ec894f6dae473b215bde  ./etc/locale.alias
+d4317d296138620e56d3dbf8b9090af51e8afcc55ef6397f729cb7bf18b73371  ./etc/locale.gen
+8b85846791ab2c8a5463c83a5be3c043e2570d7448434d41398969ed47e3e6f2  ./etc/localtime
+49e7981a83637ede2b1a9e86e950715cc1eba7526c6b9a186ca86e7e3b068e2e  ./etc/login.defs
+33ff9bc4af818cc87293172add6657c08c7daeede32fac4e3ad204217d93bcc3  ./etc/logrotate.conf
+86afa676a62cf0e1443fc638d74a4034326dc2fac59cfceafb04cd7972471f7e  ./etc/lsb-release
+8648b3927da3026581635bc5d96da609f4f092a0d4ac0f29ccf4d3e04b4e8748  ./etc/machine-id
+58219ec4bfe06d84640b4e86341feb3099cb078146c9eee73ec55152819df247  ./etc/magic
+58219ec4bfe06d84640b4e86341feb3099cb078146c9eee73ec55152819df247  ./etc/magic.mime
+acc9ad65d8e4516ab05207b4f63a3c83aaa4ad2c16e389e54024277ca099686c  ./etc/mailcap
+852fa1ba6ae9e06176848e0ca5e9b7bb620416d4efeab1c8a6ef988decc18374  ./etc/mailcap.order
+1f9ba26cce20ee30b0d64a25f3f4caf6a078e5ab51c70a44dbfb20910ba53f3c  ./etc/manpath.config
+3315f8274eb9447161d2a36d75e8a67b52fd3ea274d1da9ca5ade7b585bece43  ./etc/mime.types
+def9e1d4dbf51f44c51303349338086cf23d60c3cc7e9e99442ee554eb9f5de6  ./etc/mke2fs.conf
+08ebeaa1660b9aa8e383f9a519d33893ebc728ba823d81b6b907159488990614  ./etc/modules
+fa2defca86d7b96a73344f4cdcf42162c5761f12d661677f2fed33ece607e570  ./etc/multipath.conf
+047a1d00e6716738b74357b054a1bc2884709dd6ca0748667583b97bcdbb5c7c  ./etc/nanorc
+86ee43cde79ed4afdbcc697d74fe80cb3d9b261feab550f45beeedfba7ff9fbd  ./etc/netconfig
+20f4b0486ba8a442644f0f10fc1c947db554c83f31037d6a2ba9be8d67998c25  ./etc/networks
+96fdddd091ae70342a8d32b864ff444c6e7c82c346f7ea8899cb2710d9adb105  ./etc/nftables.conf
+916bca6b7e2fb71b52ff6efe69f15bfbf2a2a6529e5d49597ce8adefb6e9a13d  ./etc/nsswitch.conf
+2969ea5aa21a41fa364c6731eae70c4e9ffcd5d9383f4f498a725fd47725f4be  ./etc/overlayroot.conf
+01894f7bc0460ed049f658bc1cb9032f36b301c84afc61b54316026d8ba65c72  ./etc/overlayroot.local.conf
+8aa7f3472ec88a24a572d6ffd9748ce3da223fba3b2545098eaaae768b6408c4  ./etc/pam.conf
+97e7f8b051c997d9bcf417ff72b876ea80003897432420e4c1913eef4e2b80be  ./etc/papersize
+7a23cb5bdbcccddb6009e7bd66999b5921ae91f1e692785b3ed4eeefbd6d494f  ./etc/passwd
+7a23cb5bdbcccddb6009e7bd66999b5921ae91f1e692785b3ed4eeefbd6d494f  ./etc/passwd-
+66f4510566d71c4a49717f54a29d8c4268fd332a49595dbe78c072e06e5ca60f  ./etc/profile
+a90a2be9c2a88be6fbfc1fc73ba76f34698377bb19513e5de503dbb0bfe13be1  ./etc/protocols
+b0a3efc2ce09fa3fc860fc34d6dd90257df956db974395addc51bb7d49b6e1e6  ./etc/rmt
+93b45c797d096a12aadd5395fc9ae9e613a0f5cda58deefa18c79fd40eeeb3f7  ./etc/rpc
+8533c0f97f104dc24bff092e1d1c157b50865cdf6446474d2dd68c1b392ab5a0  ./etc/rsyslog.conf
+66c7d4922d4401e5a7ba570ea0a12e2becdca753030413bb2027b4ee0de07e02  ./etc/screenrc
+f82617246796b8a05e19980f4c31205f2fb8fb1804afbf0d1a6af4e487baf115  ./etc/sensors3.conf
+f6183055fd949f9c53d49ee620f85d0150123ea691d25ed1bba0c641b4ee2f48  ./etc/services
+29d860adea519eb229cda70d23c80c854cd9119f5a883d8d411f9526f50e90ea  ./etc/shadow
+29d860adea519eb229cda70d23c80c854cd9119f5a883d8d411f9526f50e90ea  ./etc/shadow-
+54c76a998d970776fa4fc57ce60bf0d1e7074ff57ba71075272c595e0f23188a  ./etc/shells
+9174a607d947b70a714e65c427ab32040ff4840a7c4ef72081bcac0e37fd3c1e  ./etc/subgid
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./etc/subgid-
+9174a607d947b70a714e65c427ab32040ff4840a7c4ef72081bcac0e37fd3c1e  ./etc/subuid
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  ./etc/subuid-
+9a839fbc59633c07ad7491c7ebde977de9b1605bcdc23a0bd3b0a37ee5459232  ./etc/sudo.conf
+b160244f6f5243092d0a08b7d8676d2eb4e3f737612357660584f796931392d7  ./etc/sudoers
+45ea576c8ca4058efd349732e99128172f6b8e7c1a7b91a692006051a2f2c24c  ./etc/sudo_logsrvd.conf
+3928dfdaf13a8ca3a6309c3eb2aaf09bcbe059f7dd261304260d436c97b77954  ./etc/sysctl.conf
+f0dcac7b1d721d2f68937a71f0229b4c4f88564fd711339951528889913cd85d  ./etc/timezone
+4b83c11baf906b8bd8612883ff856421409c4926168bdf2c2b734dcd8915d23f  ./etc/ucf.conf
+42c2214c9eb606c996d4ee4c5e0653c24459501b945596bb024d5dce773d40e2  ./etc/usb_modeswitch.conf
+684cd905549f78e025870dd5c8a3835e49f79f2bb08952eb7424537f6df5fa13  ./etc/vtrgb
+8bf4e3aaf0298b3f94a1048eafd7b7eb6e3a065edb0edff10adcc165620d7a8c  ./etc/wgetrc
+0fc794a9826011c88b118c5ff4e30dfcbebd73518e64b0cda7aaec3ad7e578bd  ./etc/xattr.conf
+e9aaf92843334f55d54c223b150f3cddb9d39bb5001bdb37d060d484864eebb3  ./etc/zsh_command_not_found

restore.arch.bash

@@ -29,7 +29,7 @@ function restore_config() {
   sleep 1
   aptpkgfile="installed_packages"
   # restore apt first
-  cp -R etc/pacman.d /etc
+  cp -Rf etc/pacman.d /etc
   cp pacman.conf /etc
   pacman --noconfirm -Sy
     if [ -f ./exclusions ]; then
@@ -37,7 +37,7 @@ function restore_config() {
   fi
   pacman -S - < $aptpkgfile
   # we should be set app wise now the configs
-  cp -R etc/ /etc 
+  cp -Rf etc/ /etc 
   cprint 3 "You may want to reboot for changes to take effect"
   cprint 2 "Done!"
 }

syssetup.bash

@@ -14,6 +14,9 @@ fi
 source ./os_probe.bash
 source ./check.bash
 
+pkgsum="pkgsum"
+hashapp="sha256sum"
+
 # Some menu things
 
 # colors
@@ -72,6 +75,10 @@ if [ "$osp" = "Openwrt" ]; then
     cp ./bootstrap.wrt.ash $tmpdir
 fi
   
+# this will be used for the restore to make sure /etc is properly overwitten
+
+find /etc -type f  -exec $hashapp '{}' \; > $tmpdir/$pkgsum
+
   arcdir=$(mktemp -d)
   echo $arcdir
  

verify.bash

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+pkgsum="pkgsum"
+hostsum="hostsums"
+hashapp="sha256sum"
+
+# this module will check to see if /etc matches whats in the restore
+
+find /etc -type f  -exec $hashapp '{}' \; > $hostsum
+
+# I know this is a cheap trick, but it works
+
+if [ -f $pkgsum ] && [ -f $hostsum ]; then
+    diff -q $pkgsum $hostsum
+    if [ $? -eq 0 ]; then
+        echo "Verify passed"
+    else
+        echo "Verify failed"
+    fi
+else
+    echo "Checksum files not found"
+fi