brain-hackers_pepepper-mirror/brain-config
1
0
Fork 0
mirror of https://github.com/brain-hackers/brain-config.git synced 2024-12-22 12:10:07 +09:00
Code Issues Projects Releases Wiki Activity

raspi-config: pass -f flag to rm

Browse Source
This commit is contained in:
Serge Schneider 2022-02-01 16:01:44 +00:00
parent 7ebef51a48
commit 750dde158a
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
raspi-config (20220201) UNRELEASED; urgency=medium
* pass -f flag to rm
-- Serge Schneider <serge@raspberrypi.com> Tue, 01 Feb 2022 16:02:27 +0000
raspi-config (20220126) bullseye; urgency=medium raspi-config (20220126) bullseye; urgency=medium
* Modify overlay functions to match format of other nonint calls * Modify overlay functions to match format of other nonint calls

12
raspi-config
View File

@ -1357,7 +1357,7 @@ do_boot_behaviour() {
B1*) B1*)
systemctl set-default multi-user.target systemctl set-default multi-user.target
ln -fs /lib/systemd/system/getty@.service /etc/systemd/system/getty.target.wants/getty@tty1.service ln -fs /lib/systemd/system/getty@.service /etc/systemd/system/getty.target.wants/getty@tty1.service
rm /etc/systemd/system/getty@tty1.service.d/autologin.conf rm -f /etc/systemd/system/getty@tty1.service.d/autologin.conf
;; ;;
B2*) B2*)
systemctl set-default multi-user.target systemctl set-default multi-user.target
@ -1372,7 +1372,7 @@ EOF
if [ -e /etc/init.d/lightdm ]; then if [ -e /etc/init.d/lightdm ]; then
systemctl set-default graphical.target systemctl set-default graphical.target
ln -fs /lib/systemd/system/getty@.service /etc/systemd/system/getty.target.wants/getty@tty1.service ln -fs /lib/systemd/system/getty@.service /etc/systemd/system/getty.target.wants/getty@tty1.service
rm /etc/systemd/system/getty@tty1.service.d/autologin.conf rm -f /etc/systemd/system/getty@tty1.service.d/autologin.conf
sed /etc/lightdm/lightdm.conf -i -e "s/^autologin-user=.*/#autologin-user=/" sed /etc/lightdm/lightdm.conf -i -e "s/^autologin-user=.*/#autologin-user=/"
disable_raspi_config_at_boot disable_raspi_config_at_boot
else else
@ -1943,9 +1943,7 @@ Exec=/usr/lib/raspi-config/cmstart.sh
EOF EOF
STATUS=enabled STATUS=enabled
elif [ $RET -eq 1 ]; then elif [ $RET -eq 1 ]; then
if [ -e /etc/xdg/autostart/xcompmgr.desktop ]; then rm -f /etc/xdg/autostart/xcompmgr.desktop
rm /etc/xdg/autostart/xcompmgr.desktop
fi
STATUS=disabled STATUS=disabled
else else
return $RET return $RET
@ -1974,9 +1972,7 @@ do_glamor() {
if [ $RET -eq 0 ]; then if [ $RET -eq 0 ]; then
systemctl disable glamor-test.service systemctl disable glamor-test.service
systemctl stop glamor-test.service systemctl stop glamor-test.service
if [ -e /usr/share/X11/xorg.conf.d/20-noglamor.conf ] ; then rm -f /usr/share/X11/xorg.conf.d/20-noglamor.conf
rm /usr/share/X11/xorg.conf.d/20-noglamor.conf
fi
STATUS=enabled STATUS=enabled
elif [ $RET -eq 1 ]; then elif [ $RET -eq 1 ]; then
systemctl enable glamor-test.service && systemctl enable glamor-test.service &&