packages/raspi-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!8 [sync] PR-6: 跟进上游版本，适配到 openEuler 22.03 LTS

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @jianminw 
Signed-off-by: @jianminw
This commit is contained in:
openeuler-ci-bot 2022-04-12 13:57:23 +00:00 committed by Gitee
commit 96d8bda6a4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 189 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

266
openEuler.patch
View File

@ -1,5 +1,5 @@
diff --git a/raspi-config b/raspi-config diff --git a/raspi-config b/raspi-config
index a640864..ae97af5 100755 index 4716caa..8fe1c59 100755
--- a/raspi-config --- a/raspi-config
+++ b/raspi-config +++ b/raspi-config
@@ -11,8 +11,8 @@ CONFIG=/boot/config.txt @@ -11,8 +11,8 @@ CONFIG=/boot/config.txt
@ -13,16 +13,38 @@ index a640864..ae97af5 100755
return 0 return 0
else else
return 1 return 1
@@ -98,7 +98,7 @@ has_analog() { @@ -98,15 +98,18 @@ has_analog() {
} }
is_installed() { is_installed() {
- if [ "$(dpkg -l "$1" 2> /dev/null | tail -n 1 | cut -d ' ' -f 1)" != "ii" ]; then - if [ "$(dpkg -l "$1" 2> /dev/null | tail -n 1 | cut -d ' ' -f 1)" != "ii" ]; then
+ if [ "$(rpm -qa "$1" 2> /dev/null | wc -l)" == "0" ]; then + if [ "$(rpm -qa "$1" 2> /dev/null | wc -l)" == "0" ]; then
return 1 return 1
else else
return 0 return 0
@@ -141,7 +141,7 @@ get_can_expand() { fi
}
-deb_ver () {
- ver=`cat /etc/debian_version | cut -d . -f 1`
+rpm_ver () {
+ ver=`cat /etc/os-release | grep VERSION_ID | awk -F = '{print $2}' | cut -d . -f 1`
+ if [ "x${ver:0:1}" == "x\"" ]; then
+ ver=${ver:1}
+ fi
echo $ver
}
@@ -133,7 +136,7 @@ configuration of the Raspberry Pi. Although it can be run
at any time, some of the options may have difficulties if
you have heavily customised your installation.
-$(dpkg -s raspi-config 2> /dev/null | grep Version)\
+$(rpm -qi raspi-config 2> /dev/null | grep Version)\
" 20 70 1
return 0
}
@@ -144,7 +147,7 @@ get_can_expand() {
PART_NUM="$(echo "$ROOT_PART" | grep -o "[[:digit:]]*$")" PART_NUM="$(echo "$ROOT_PART" | grep -o "[[:digit:]]*$")"
@ -31,7 +53,7 @@ index a640864..ae97af5 100755
echo 1 echo 1
exit exit
fi fi
@@ -162,19 +162,30 @@ do_expand_rootfs() { @@ -165,19 +168,30 @@ do_expand_rootfs() {
# NOTE: the NOOBS partition layout confuses parted. For now, let's only # NOTE: the NOOBS partition layout confuses parted. For now, let's only
# agree to work with a sufficiently simple partition layout # agree to work with a sufficiently simple partition layout
@ -67,7 +89,7 @@ index a640864..ae97af5 100755
[ "$PART_START" ] || return 1 [ "$PART_START" ] || return 1
# Return value will likely be error for fdisk as it fails to reload the # Return value will likely be error for fdisk as it fails to reload the
# partition table because the root fs is mounted # partition table because the root fs is mounted
@@ -190,6 +201,15 @@ $PART_START @@ -193,6 +207,15 @@ $PART_START
p p
w w
EOF EOF
@ -83,7 +105,7 @@ index a640864..ae97af5 100755
ASK_TO_REBOOT=1 ASK_TO_REBOOT=1
# now set up an init.d script # now set up an init.d script
@@ -226,6 +246,7 @@ EOF @@ -229,6 +252,7 @@ EOF
if [ "$INTERACTIVE" = True ]; then if [ "$INTERACTIVE" = True ]; then
whiptail --msgbox "Root partition has been resized.\nThe filesystem will be enlarged upon the next reboot" 20 60 2 whiptail --msgbox "Root partition has been resized.\nThe filesystem will be enlarged upon the next reboot" 20 60 2
fi fi
@ -91,8 +113,8 @@ index a640864..ae97af5 100755
} }
set_config_var() { set_config_var() {
@@ -342,8 +363,9 @@ do_blanking() { @@ -407,8 +431,9 @@ do_blanking() {
CURRENT=1 CURRENT=1
fi fi
if [ "$INTERACTIVE" = True ]; then if [ "$INTERACTIVE" = True ]; then
- if [ "$(dpkg -l xscreensaver | tail -n 1 | cut -d ' ' -f 1)" = "ii" ]; then - if [ "$(dpkg -l xscreensaver | tail -n 1 | cut -d ' ' -f 1)" = "ii" ]; then
@ -103,7 +125,7 @@ index a640864..ae97af5 100755
fi fi
whiptail --yesno "Would you like to enable screen blanking?" $DEFAULT 20 60 2 whiptail --yesno "Would you like to enable screen blanking?" $DEFAULT 20 60 2
RET=$? RET=$?
@@ -765,7 +787,7 @@ clear_overclock () { @@ -807,7 +832,7 @@ clear_overclock () {
} }
get_ssh() { get_ssh() {
@ -112,7 +134,7 @@ index a640864..ae97af5 100755
echo 1 echo 1
else else
echo 0 echo 0
@@ -791,12 +813,12 @@ do_ssh() { @@ -833,12 +858,12 @@ do_ssh() {
fi fi
if [ $RET -eq 0 ]; then if [ $RET -eq 0 ]; then
ssh-keygen -A && ssh-keygen -A &&
@ -129,61 +151,48 @@ index a640864..ae97af5 100755
STATUS=disabled STATUS=disabled
else else
return $RET return $RET
@@ -807,7 +829,7 @@ do_ssh() { @@ -849,7 +874,7 @@ do_ssh() {
} }
get_vnc() { get_vnc() {
- if systemctl status vncserver-x11-serviced.service | grep -q -w active; then - if systemctl status vncserver-x11-serviced.service | grep -q -w active; then
+ if systemctl status vncserver@1.service | grep -q -w active; then + if systemctl status vncserver@:1.service | grep -q -w active; then
echo 0 echo 0
else else
echo 1 echo 1
@@ -826,24 +848,54 @@ do_vnc() { @@ -861,33 +886,39 @@ do_vnc() {
if [ $(get_vnc) -eq 0 ]; then
DEFAULT=
fi
- APT_GET_FLAGS=""
if [ "$INTERACTIVE" = True ]; then
whiptail --yesno "Would you like the VNC Server to be enabled?" $DEFAULT 20 60 2
RET=$?
else
RET=$1 RET=$1
- APT_GET_FLAGS="-y"
fi fi
if [ $RET -eq 0 ]; then if [ $RET -eq 0 ]; then
- if is_installed realvnc-vnc-server || apt-get install realvnc-vnc-server; then - if is_installed realvnc-vnc-server || apt-get install "$APT_GET_FLAGS" realvnc-vnc-server; then
- systemctl enable vncserver-x11-serviced.service && - systemctl enable vncserver-x11-serviced.service &&
- systemctl start vncserver-x11-serviced.service && - systemctl start vncserver-x11-serviced.service &&
+ if is_installed tigervnc-server || dnf install -y tigervnc-server; then + if is_installed tigervnc-server || dnf install -y tigervnc-server; then
+ if [ ! -f /etc/systemd/system/vncserver@.service ]; then + cp /lib/systemd/system/vncserver@.service /etc/systemd/system/vncserver@:1.service
+ cat > /etc/systemd/system/vncserver\@.service << EOF + sed -i '/:1='"$SUDO_USER"'/d' /etc/tigervnc/vncserver.users
+[Unit] + sed -i '$a\:1='"$SUDO_USER"'' /etc/tigervnc/vncserver.users
+Description=Remote desktop service (VNC) + systemctl enable vncserver@:1.service &&
+After=syslog.target network.target + systemctl start vncserver@:1.service &&
+
+[Service]
+Type=forking
+WorkingDirectory=/home/pi
+User=pi
+Group=pi
+
+PIDFile=/home/pi/.vnc/%H:%i.pid
+
+ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill :%i > /dev/null 2>&1 || :'
+ExecStart=/usr/bin/vncserver :%i
+ExecStop=/usr/bin/vncserver -kill :%i
+
+Restart=on-success
+RestartSec=15
+
+[Install]
+WantedBy=multi-user.target
+EOF
+ fi
+ systemctl enable vncserver@1 &&
+ systemctl start vncserver@1 &&
STATUS=enabled STATUS=enabled
else else
return 1 return 1
fi fi
elif [ $RET -eq 1 ]; then elif [ $RET -eq 1 ]; then
- if is_installed realvnc-vnc-server; then - if is_installed realvnc-vnc-server; then
- systemctl disable vncserver-x11-serviced.service - systemctl disable vncserver-x11-serviced.service
- systemctl stop vncserver-x11-serviced.service - systemctl stop vncserver-x11-serviced.service
+ if is_installed tigervnc-server; then + if is_installed tigervnc-server; then
+ systemctl disable vncserver@1 + systemctl disable vncserver@:1.service
+ systemctl stop vncserver@1 + systemctl stop vncserver@:1.service
fi fi
STATUS=disabled STATUS=disabled
else else
@ -200,25 +209,24 @@ index a640864..ae97af5 100755
fi fi
} }
@@ -1313,6 +1365,9 @@ do_boot_behaviour() { @@ -1389,6 +1420,9 @@ do_boot_behaviour() {
;;
B2*) B2*)
systemctl set-default multi-user.target systemctl --quiet set-default multi-user.target
ln -fs /lib/systemd/system/getty@.service /etc/systemd/system/getty.target.wants/getty@tty1.service
+ if [ ! -d /etc/systemd/system/getty@tty1.service.d ]; then + if [ ! -d /etc/systemd/system/getty@tty1.service.d ]; then
+ mkdir /etc/systemd/system/getty@tty1.service.d + mkdir /etc/systemd/system/getty@tty1.service.d
+ fi + fi
cat > /etc/systemd/system/getty@tty1.service.d/autologin.conf << EOF cat > /etc/systemd/system/getty@tty1.service.d/autologin.conf << EOF
[Service] [Service]
ExecStart= ExecStart=
@@ -1320,21 +1375,24 @@ ExecStart=-/sbin/agetty --autologin $USER --noclear %I \$TERM @@ -1396,19 +1430,22 @@ ExecStart=-/sbin/agetty --autologin $USER --noclear %I \$TERM
EOF EOF
;; ;;
B3*) B3*)
- if [ -e /etc/init.d/lightdm ]; then - if [ -e /etc/init.d/lightdm ]; then
+ if [ -e /etc/lightdm ]; then + if [ -e /etc/lightdm ]; then
systemctl set-default graphical.target systemctl --quiet set-default graphical.target
ln -fs /lib/systemd/system/getty@.service /etc/systemd/system/getty.target.wants/getty@tty1.service rm -f /etc/systemd/system/getty@tty1.service.d/autologin.conf
rm /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
@ -230,15 +238,14 @@ index a640864..ae97af5 100755
B4*) B4*)
- if [ -e /etc/init.d/lightdm ]; then - if [ -e /etc/init.d/lightdm ]; then
+ if [ -e /etc/lightdm ]; then + if [ -e /etc/lightdm ]; then
systemctl set-default graphical.target systemctl --quiet set-default graphical.target
ln -fs /lib/systemd/system/getty@.service /etc/systemd/system/getty.target.wants/getty@tty1.service
+ if [ ! -d /etc/systemd/system/getty@tty1.service.d ]; then + if [ ! -d /etc/systemd/system/getty@tty1.service.d ]; then
+ mkdir /etc/systemd/system/getty@tty1.service.d + mkdir /etc/systemd/system/getty@tty1.service.d
+ fi + fi
cat > /etc/systemd/system/getty@tty1.service.d/autologin.conf << EOF cat > /etc/systemd/system/getty@tty1.service.d/autologin.conf << EOF
[Service] [Service]
ExecStart= ExecStart=
@@ -1343,7 +1401,7 @@ EOF @@ -1417,7 +1454,7 @@ EOF
sed /etc/lightdm/lightdm.conf -i -e "s/^\(#\|\)autologin-user=.*/autologin-user=$USER/" sed /etc/lightdm/lightdm.conf -i -e "s/^\(#\|\)autologin-user=.*/autologin-user=$USER/"
disable_raspi_config_at_boot disable_raspi_config_at_boot
else else
@ -247,7 +254,43 @@ index a640864..ae97af5 100755
return 1 return 1
fi fi
;; ;;
@@ -1733,19 +1791,19 @@ do_onewire() { @@ -1716,7 +1753,7 @@ EOF
}
get_camera() {
- if [ $(deb_ver) -le 10 ]; then
+ if [ $(rpm_ver) -le 21 ]; then
CAM=$(get_config_var start_x $CONFIG)
if [ $CAM -eq 1 ]; then
echo 0
@@ -1738,7 +1775,7 @@ get_camera() {
}
do_camera() {
- if [ $(deb_ver) -le 10 ] && [ ! -e /boot/start_x.elf ]; then
+ if [ $(rpm_ver) -le 21 ] && [ ! -e /boot/start_x.elf ]; then
whiptail --msgbox "Your firmware appears to be out of date (no start_x.elf). Please update" 20 60 2
return 1
fi
@@ -1761,7 +1798,7 @@ do_camera() {
ASK_TO_REBOOT=1
fi
if [ $RET -eq 0 ]; then
- if [ $(deb_ver) -le 10 ] ; then
+ if [ $(rpm_ver) -le 21 ] ; then
set_config_var start_x 1 $CONFIG
CUR_GPU_MEM=$(get_config_var gpu_mem $CONFIG)
if [ -z "$CUR_GPU_MEM" ] || [ "$CUR_GPU_MEM" -lt 128 ]; then
@@ -1772,7 +1809,7 @@ do_camera() {
fi
STATUS=enabled
elif [ $RET -eq 1 ]; then
- if [ $(deb_ver) -le 10 ] ; then
+ if [ $(rpm_ver) -le 21 ] ; then
set_config_var start_x 0 $CONFIG
sed $CONFIG -i -e "s/^start_file/#start_file/"
else
@@ -1890,19 +1927,19 @@ do_legacy() {
} }
do_gldriver() { do_gldriver() {
@ -277,11 +320,19 @@ index a640864..ae97af5 100755
+# whiptail --msgbox "Required packages not found, please install: ${missing_packages}" 20 60 2 +# whiptail --msgbox "Required packages not found, please install: ${missing_packages}" 20 60 2
+# return 1 +# return 1
+# fi +# fi
if is_pifour ; then
GLOPT=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "GL Driver" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT \ GLOPT=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "GL Driver" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT \
"G1 Legacy" "Original non-GL desktop driver" \ "G1 Legacy" "Original non-GL desktop driver" \
@@ -1895,8 +1953,8 @@ do_net_names () { "G2 GL (Full KMS)" "OpenGL desktop driver with full KMS" \
} @@ -2044,6 +2081,7 @@ do_net_names () {
rm -f /etc/systemd/network/73-usb-net-by-mac.link
STATUS=enabled
elif [ $RET -eq 1 ]; then
+ mkdir -p /etc/systemd/network
ln -sf /dev/null /etc/systemd/network/99-default.link
ln -sf /dev/null /etc/systemd/network/73-usb-net-by-mac.link
STATUS=disabled
@@ -2056,8 +2094,8 @@ do_net_names () {
}
do_update() { do_update() {
- apt-get update && - apt-get update &&
@ -291,7 +342,7 @@ index a640864..ae97af5 100755
printf "Sleeping 5 seconds before reloading raspi-config\n" && printf "Sleeping 5 seconds before reloading raspi-config\n" &&
sleep 5 && sleep 5 &&
exec raspi-config exec raspi-config
@@ -2070,6 +2128,63 @@ list_wlan_interfaces() { @@ -2270,6 +2308,63 @@ list_wlan_interfaces() {
done done
} }
@ -355,7 +406,7 @@ index a640864..ae97af5 100755
do_wifi_ssid_passphrase() { do_wifi_ssid_passphrase() {
RET=0 RET=0
IFACE_LIST="$(list_wlan_interfaces)" IFACE_LIST="$(list_wlan_interfaces)"
@@ -2542,8 +2657,8 @@ do_proxy() { @@ -2747,8 +2842,8 @@ do_proxy() {
sed -i "/^export ${SCHEME}_/Id" /etc/profile.d/proxy.sh sed -i "/^export ${SCHEME}_/Id" /etc/profile.d/proxy.sh
fi fi
if [ "${SCHEME#*http}" != "$SCHEME" ]; then if [ "${SCHEME#*http}" != "$SCHEME" ]; then
@ -366,7 +417,7 @@ index a640864..ae97af5 100755
fi fi
fi fi
if [ -z "$ADDRESS" ]; then if [ -z "$ADDRESS" ]; then
@@ -2557,7 +2672,7 @@ do_proxy() { @@ -2762,7 +2857,7 @@ do_proxy() {
echo "export ${SCHEME}_proxy=\"$ADDRESS\"" >> /etc/profile.d/proxy.sh echo "export ${SCHEME}_proxy=\"$ADDRESS\"" >> /etc/profile.d/proxy.sh
fi fi
if [ "${SCHEME#*http}" != "$SCHEME" ]; then if [ "${SCHEME#*http}" != "$SCHEME" ]; then
@ -375,7 +426,7 @@ index a640864..ae97af5 100755
fi fi
done done
if [ "$INTERACTIVE" = True ]; then if [ "$INTERACTIVE" = True ]; then
@@ -2588,7 +2703,9 @@ do @@ -2793,7 +2888,9 @@ do
--expand-rootfs) --expand-rootfs)
INTERACTIVE=False INTERACTIVE=False
do_expand_rootfs do_expand_rootfs
@ -386,7 +437,7 @@ index a640864..ae97af5 100755
exit 0 exit 0
;; ;;
--apply-os-config) --apply-os-config)
@@ -2634,8 +2751,8 @@ do_system_menu() { @@ -2839,8 +2936,8 @@ do_system_menu() {
"S3 Password" "Change password for the '$USER' user" \ "S3 Password" "Change password for the '$USER' user" \
"S4 Hostname" "Set name for this computer on a network" \ "S4 Hostname" "Set name for this computer on a network" \
"S5 Boot / Auto Login" "Select boot into desktop or to command line" \ "S5 Boot / Auto Login" "Select boot into desktop or to command line" \
@ -397,7 +448,27 @@ index a640864..ae97af5 100755
"S8 Power LED" "Set behaviour of power LED" \ "S8 Power LED" "Set behaviour of power LED" \
3>&1 1>&2 2>&3) 3>&1 1>&2 2>&3)
elif is_live ; then elif is_live ; then
@@ -2661,7 +2778,7 @@ do_system_menu() { @@ -2849,7 +2946,7 @@ do_system_menu() {
"S3 Password" "Change password for the '$USER' user" \
"S4 Hostname" "Set name for this computer on a network" \
"S5 Boot / Auto Login" "Select boot into desktop or to command line" \
- "S6 Network at Boot" "Select wait for network connection on boot" \
+ `# "S6 Network at Boot" "Select wait for network connection on boot"` \
3>&1 1>&2 2>&3)
else
FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "System Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \
@@ -2857,8 +2954,8 @@ do_system_menu() {
"S3 Password" "Change password for the '$USER' user" \
"S4 Hostname" "Set name for this computer on a network" \
"S5 Boot / Auto Login" "Select boot into desktop or to command line" \
- "S6 Network at Boot" "Select wait for network connection on boot" \
- "S7 Splash Screen" "Choose graphical splash screen or text boot" \
+ `# "S6 Network at Boot" "Select wait for network connection on boot"` \
+ `# "S7 Splash Screen" "Choose graphical splash screen or text boot"` \
3>&1 1>&2 2>&3)
fi
RET=$?
@@ -2866,7 +2963,7 @@ do_system_menu() {
return 0 return 0
elif [ $RET -eq 0 ]; then elif [ $RET -eq 0 ]; then
case "$FUN" in case "$FUN" in
@ -406,16 +477,16 @@ index a640864..ae97af5 100755
S2\ *) do_audio ;; S2\ *) do_audio ;;
S3\ *) do_change_pass ;; S3\ *) do_change_pass ;;
S4\ *) do_hostname ;; S4\ *) do_hostname ;;
@@ -2707,7 +2824,7 @@ do_interface_menu() { @@ -2935,7 +3032,7 @@ do_interface_menu() {
FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Interfacing Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \ FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Interfacing Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \
"P1 Camera" "Enable/disable connection to the Raspberry Pi Camera" \ "I1 Legacy Camera" "Enable/disable legacy camera support" \
"P2 SSH" "Enable/disable remote command line access using SSH" \ "I2 SSH" "Enable/disable remote command line access using SSH" \
- "P3 VNC" "Enable/disable graphical remote access using RealVNC" \ - "I3 VNC" "Enable/disable graphical remote access using RealVNC" \
+ "P3 VNC" "Enable/disable graphical remote access using TigerVNC" \ + "I3 VNC" "Enable/disable graphical remote access using TigerVNC" \
"P4 SPI" "Enable/disable automatic loading of SPI kernel module" \ "I4 SPI" "Enable/disable automatic loading of SPI kernel module" \
"P5 I2C" "Enable/disable automatic loading of I2C kernel module" \ "I5 I2C" "Enable/disable automatic loading of I2C kernel module" \
"P6 Serial Port" "Enable/disable shell messages on the serial connection" \ "I6 Serial Port" "Enable/disable shell messages on the serial connection" \
@@ -2741,7 +2858,7 @@ do_performance_menu() { @@ -2969,7 +3066,7 @@ do_performance_menu() {
FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Performance Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \ FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Performance Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \
"P1 Overclock" "Configure CPU overclocking" \ "P1 Overclock" "Configure CPU overclocking" \
"P2 GPU Memory" "Change the amount of memory made available to the GPU" \ "P2 GPU Memory" "Change the amount of memory made available to the GPU" \
@ -424,19 +495,17 @@ index a640864..ae97af5 100755
"P4 Fan" "Set behaviour of GPIO fan" \ "P4 Fan" "Set behaviour of GPIO fan" \
3>&1 1>&2 2>&3) 3>&1 1>&2 2>&3)
RET=$? RET=$?
@@ -2783,8 +2900,8 @@ do_advanced_menu() { @@ -3011,7 +3108,7 @@ do_advanced_menu() {
if is_pifour ; then if is_pifour ; then
FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Advanced Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \ FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Advanced Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \
"A1 Expand Filesystem" "Ensures that all of the SD card is available" \ "A1 Expand Filesystem" "Ensures that all of the SD card is available" \
- "A2 GL Driver" "Enable/disable experimental desktop GL driver" \
- "A3 Compositor" "Enable/disable xcompmgr composition manager" \ - "A3 Compositor" "Enable/disable xcompmgr composition manager" \
+ `# "A2 GL Driver" "Enable/disable experimental desktop GL driver"` \
+ `# "A3 Compositor" "Enable/disable xcompmgr composition manager"` \ + `# "A3 Compositor" "Enable/disable xcompmgr composition manager"` \
"A4 Network Interface Names" "Enable/disable predictable network i/f names" \ "A4 Network Interface Names" "Enable/disable predictable network i/f names" \
"A5 Network Proxy Settings" "Configure network proxy settings" \ "A5 Network Proxy Settings" "Configure network proxy settings" \
"A6 Boot Order" "Choose network or USB device boot" \ "A6 Boot Order" "Choose network or USB device boot" \
@@ -2794,8 +2911,8 @@ do_advanced_menu() { @@ -3021,19 +3118,19 @@ do_advanced_menu() {
elif is_pi ; then if is_kms; then
FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Advanced Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \ FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Advanced Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \
"A1 Expand Filesystem" "Ensures that all of the SD card is available" \ "A1 Expand Filesystem" "Ensures that all of the SD card is available" \
- "A2 GL Driver" "Enable/disable experimental desktop GL driver" \ - "A2 GL Driver" "Enable/disable experimental desktop GL driver" \
@ -445,17 +514,31 @@ index a640864..ae97af5 100755
+ `# "A3 Compositor" "Enable/disable xcompmgr composition manager"` \ + `# "A3 Compositor" "Enable/disable xcompmgr composition manager"` \
"A4 Network Interface Names" "Enable/disable predictable network i/f names" \ "A4 Network Interface Names" "Enable/disable predictable network i/f names" \
"A5 Network Proxy Settings" "Configure network proxy settings" \ "A5 Network Proxy Settings" "Configure network proxy settings" \
- "A8 Glamor" "Enable/disable glamor graphics acceleration" \
+ `# "A8 Glamor" "Enable/disable glamor graphics acceleration"` \
3>&1 1>&2 2>&3) 3>&1 1>&2 2>&3)
@@ -2819,7 +2936,7 @@ do_advanced_menu() { else
FUN=$(whiptail --title "Raspberry Pi Software Configuration Tool (raspi-config)" --menu "Advanced Options" $WT_HEIGHT $WT_WIDTH $WT_MENU_HEIGHT --cancel-button Back --ok-button Select \
"A1 Expand Filesystem" "Ensures that all of the SD card is available" \
- "A2 GL Driver" "Enable/disable experimental desktop GL driver" \
+ `# "A2 GL Driver" "Enable/disable experimental desktop GL driver"` \
"A4 Network Interface Names" "Enable/disable predictable network i/f names" \
"A5 Network Proxy Settings" "Configure network proxy settings" \
- "A8 Glamor" "Enable/disable glamor graphics acceleration" \
+ `# "A8 Glamor" "Enable/disable glamor graphics acceleration"` \
3>&1 1>&2 2>&3)
fi
else
@@ -3056,7 +3153,7 @@ do_advanced_menu() {
A7\ *) do_boot_rom ;; A7\ *) do_boot_rom ;;
A8\ *) do_pi4video ;; A8\ *) do_glamor ;;
*) whiptail --msgbox "Programmer error: unrecognized option" 20 60 1 ;; *) whiptail --msgbox "Programmer error: unrecognized option" 20 60 1 ;;
- esac || whiptail --msgbox "There was an error running option $FUN" 20 60 1 - esac || whiptail --msgbox "There was an error running option $FUN" 20 60 1
+ esac || [ $? -eq 2 ] || whiptail --msgbox "There was an error running option $FUN" 20 60 1 + esac || [ $? -eq 2 ] || whiptail --msgbox "There was an error running option $FUN" 20 60 1
fi fi
} }
@@ -2856,17 +2973,17 @@ if [ "$INTERACTIVE" = True ]; then @@ -3093,17 +3190,17 @@ if [ "$INTERACTIVE" = True ]; then
calc_wt_size calc_wt_size
while [ "$USER" = "root" ] || [ -z "$USER" ]; do while [ "$USER" = "root" ] || [ -z "$USER" ]; do
if ! USER=$(whiptail --inputbox "raspi-config could not determine the default user.\\n\\nWhat user should these settings apply to?" 20 60 pi 3>&1 1>&2 2>&3); then if ! USER=$(whiptail --inputbox "raspi-config could not determine the default user.\\n\\nWhat user should these settings apply to?" 20 60 pi 3>&1 1>&2 2>&3); then
@ -476,3 +559,12 @@ index a640864..ae97af5 100755
"6 Advanced Options" "Configure advanced settings" \ "6 Advanced Options" "Configure advanced settings" \
"8 Update" "Update this tool to the latest version" \ "8 Update" "Update this tool to the latest version" \
"9 About raspi-config" "Information about this configuration tool" \ "9 About raspi-config" "Information about this configuration tool" \
@@ -3113,7 +3210,7 @@ if [ "$INTERACTIVE" = True ]; then
"1 System Options" "Configure system settings" \
"2 Display Options" "Configure display settings" \
"3 Interface Options" "Configure connections to peripherals" \
- "5 Localisation Options" "Configure language and regional settings" \
+ `# "5 Localisation Options" "Configure language and regional settings"` \
"6 Advanced Options" "Configure advanced settings" \
"8 Update" "Update this tool to the latest version" \
"9 About raspi-config" "Information about this configuration tool" \

BIN
raspi-config-8607dbc7281cef142b2e0c12839176f189d48a1b.tar.gz
View File

Binary file not shown.

BIN
raspi-config-d3fe4e7058dfaa616aa8a4bb053c31c8d59c0135.tar.gz Normal file
View File

Binary file not shown.

14
raspi-config.spec
View File

@ -5,12 +5,12 @@
%global _service_path /etc/init.d %global _service_path /etc/init.d
%global _proxy_path /etc/sudoers.d %global _proxy_path /etc/sudoers.d
%global _systemd_path /etc/systemd/system %global _systemd_path /etc/systemd/system
%global commitid 8607dbc7281cef142b2e0c12839176f189d48a1b %global commitid d3fe4e7058dfaa616aa8a4bb053c31c8d59c0135
%global debug_package %{nil} %global debug_package %{nil}
Name: raspi-config Name: raspi-config
Version: 20210625 Version: 20220323
Release: 4 Release: 1
Summary: Raspberry Pi configuration tool Summary: Raspberry Pi configuration tool
License: MIT License: MIT
URL: https://github.com/RPi-Distro/raspi-config URL: https://github.com/RPi-Distro/raspi-config
@ -44,7 +44,7 @@ mkdir -p %{buildroot}%{_proxy_path}
mkdir -p %{buildroot}%{_systemd_path} mkdir -p %{buildroot}%{_systemd_path}
cd %{name}-%{commitid} cd %{name}-%{commitid}
install -p -m 755 usr/lib/raspi-config/* %{buildroot}%{_lib_path}/ install -p -m 755 usr/lib/raspi-config/cmstart.sh %{buildroot}%{_lib_path}/
install -p -m 755 raspi-config %{buildroot}%{_bin_path}/ install -p -m 755 raspi-config %{buildroot}%{_bin_path}/
install -p -m 755 debian/raspi-config.init %{buildroot}%{_service_path}/raspi-config install -p -m 755 debian/raspi-config.init %{buildroot}%{_service_path}/raspi-config
install -p -m 644 debian/changelog %{buildroot}%{_doc_path}/ install -p -m 644 debian/changelog %{buildroot}%{_doc_path}/
@ -64,6 +64,12 @@ cd -
%{_systemd_path}/* %{_systemd_path}/*
%changelog %changelog
* Wed Mar 23 2022 Yafen Fang <yafen@iscas.ac.cn> - 20220323-1
- update to upstream's last commit (d3fe4e7058dfaa616aa8a4bb053c31c8d59c0135): Fix incorrect detection of read-only boot partition
- adjust for openEuler
- fix bug for P3 VNC and A4 Network Interface Names
- remove unused init_resize.sh
* Wed Sep 29 2021 Yafen Fang <yafen@iscas.ac.cn> - 20210625-4 * Wed Sep 29 2021 Yafen Fang <yafen@iscas.ac.cn> - 20210625-4
- enable select boot order - enable select boot order
- enable select bootloader version - enable select bootloader version