diff options
| author | Max Rees <maxcrees@me.com> | 2019-09-09 01:20:30 -0500 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2019-09-09 01:24:31 -0500 |
| commit | 2b957d5e230510b304b7ffa72c6401c49ffdd41f (patch) | |
| tree | 8add46d2b4b029a0e8c614084febe00e5f2fe9d6 | |
| parent | cf356b050604815c7d9df80aa2897d0b39ec751b (diff) | |
| download | packages-2b957d5e230510b304b7ffa72c6401c49ffdd41f.tar.gz packages-2b957d5e230510b304b7ffa72c6401c49ffdd41f.tar.bz2 packages-2b957d5e230510b304b7ffa72c6401c49ffdd41f.tar.xz packages-2b957d5e230510b304b7ffa72c6401c49ffdd41f.zip | |
user/grub: fix some mistakes in update-grub
* If $ADELIE_MANUAL_CONFIG is empty or unset, the comparison will fail
since it isn't a valid integer. use = instead of -eq
* Make a backup of grub.cfg only if it exists
| -rw-r--r-- | user/grub/APKBUILD | 2 | ||||
| -rw-r--r-- | user/grub/update-grub | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/user/grub/APKBUILD b/user/grub/APKBUILD index 1c1532278..d571310e7 100644 --- a/user/grub/APKBUILD +++ b/user/grub/APKBUILD @@ -177,5 +177,5 @@ f2a7d9ab6c445f4e402e790db56378cecd6631b5c367451aa6ce5c01cd95b95c83c3dd24d6d4b857 088455205f2f397d60e43eab19ed73994880ea1f442661f7975846cceaf2b112d92fd1341119d7dbfad3af2174dfd4d4721f31dead1ac35f4a3cb7c0d92f8a04 the-arch-everyone-uses-and-nobody-loves.patch 8752b5e689ec3b7e1f438c7207adc517d7acb4f7d15fda2907bc9177883a686f23994c66641bfc0c7620365415972b5d8b74f511c13dd234f5f3461dda4bb445 x86_64_asm.patch 1e6ae4a3884829864dbd789d3c3a0d43a5aa5f279c3ebb25f71775686e9236bc1c6295e5064ad32b384635987ee0814df95e9ca33bc57bc8e0aeb47bec34270e default-grub -f08e29cb8bc344d62e37ffe003a74c1316c19aa329a4c2af94c99bfc90cb2968a37811244a7617cf1f1c393119f6398200d094b7758c19583cca390630c106ec update-grub +0907a810e9ba5be92d10dae38403d1e50fb9b324799df36d2241ff59f545dace37a65f2b1c8f07367220da4fd341d8f21dd9a4fab8da6c87ae52d7ffbca3dbd7 update-grub 78b7ec141a364994c7de181e47fedca820add9960c56c7adf4c14ee11d5249a0887fd788ecd5d24b9bdd102b7c40395181e2f7c3fe5ab795dd7c0057ba1115c5 quirk-01_radeon_agpmode" diff --git a/user/grub/update-grub b/user/grub/update-grub index c8c495390..d22930bd7 100644 --- a/user/grub/update-grub +++ b/user/grub/update-grub @@ -1,6 +1,6 @@ #!/bin/sh -e . /etc/default/grub -if [ "$ADELIE_MANUAL_CONFIG" -eq 1 ]; then +if [ "$ADELIE_MANUAL_CONFIG" = 1 ]; then cat >&2 <<-EOF * * You have specified that you are using a manual GRUB configuration. @@ -10,5 +10,7 @@ if [ "$ADELIE_MANUAL_CONFIG" -eq 1 ]; then exit 0 fi -cp -p /boot/grub/grub.cfg /boot/grub/grub.cfg.update-grub-old +if [ -e /boot/grub/grub.cfg ]; then + cp -p /boot/grub/grub.cfg /boot/grub/grub.cfg.update-grub-old +fi exec grub-mkconfig -o /boot/grub/grub.cfg |