From a4dcc6ab8574c80509f097a3c018f5037e9ac13d Mon Sep 17 00:00:00 2001 From: Arnav Singh Date: Wed, 28 Aug 2024 15:24:46 -0700 Subject: [PATCH] main/postmarketos-base-ui: add numeric ordering prefix to sshd_config.d config file (MR 5539) This allows it to have a well-defined order with respect to other user-managed files. Also add a newline to the end of the file. --- main/postmarketos-base-ui/APKBUILD | 6 +++--- ...tfs-etc-ssh-sshd_config.d-50-postmarketos-ui-policy.conf | 1 + ...rootfs-etc-ssh-sshd_config.d-postmarketos-ui-policy.conf | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 main/postmarketos-base-ui/rootfs-etc-ssh-sshd_config.d-50-postmarketos-ui-policy.conf delete mode 100644 main/postmarketos-base-ui/rootfs-etc-ssh-sshd_config.d-postmarketos-ui-policy.conf diff --git a/main/postmarketos-base-ui/APKBUILD b/main/postmarketos-base-ui/APKBUILD index a154af02d..7e027bbf6 100644 --- a/main/postmarketos-base-ui/APKBUILD +++ b/main/postmarketos-base-ui/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Clayton Craft pkgname=postmarketos-base-ui pkgver=28 -pkgrel=0 +pkgrel=1 pkgdesc="Meta package for minimal postmarketOS UI base" url="https://postmarketos.org" arch="noarch" @@ -72,7 +72,7 @@ _source644=" usr/share/mkinitfs/files/10-wireless-regdb.files " _source600=" - etc/ssh/sshd_config.d/postmarketos-ui-policy.conf + etc/ssh/sshd_config.d/50-postmarketos-ui-policy.conf usr/lib/NetworkManager/system-connections/USB_Networking.nmconnection " _source755=" @@ -319,7 +319,7 @@ d4b4c4fed2dee7266f6a87ae266691377593014943e2953e4cd87a59f3110f25bfb5f3f866cc8435 900554534191fa0797064d35350934cdd8af59f30f0ae7d8ec63c2e11c44a16c643d3024b6543940488cd590fec1d392548bcaacc3be88cddff90f69b17ece07 rootfs-usr-lib-NetworkManager-conf.d-50-use-dnsmasq.conf 92930f027626825b027f585a9be180f8a6ebae6dc44d2cf8f9d43cce00db8cbb43c33fc341fe382abacb832ea1b6414dc4c8129d265b0258d096599b2e206a93 rootfs-usr-share-wireplumber-wireplumber.conf.d-50-bluetooth.conf 66a7a72746e822676d0ec76160e39b65c711e574a6334f3aad38c563d3104b33d0619d50b92c9201546fd81bfd10cfe0e4a59278cbcbddf20a238f6ad71c050c rootfs-usr-share-mkinitfs-files-10-wireless-regdb.files -ee59e9fd55a8458fa1f149890680c9353def9d49a52199d104f84db3fc588edf23e2acbb9fcf84c8bb4fd0bd8fe3186eb2cc444a3a7eeececcd8eee0d74037d9 rootfs-etc-ssh-sshd_config.d-postmarketos-ui-policy.conf +824dd5cdd1353b0d4c43f6580572c804eaf8f165c3cc737901abdf1303412f68ac0192044e8d50773bdb3873e687d0ccddd433080f5f108ca5837db76f164dab rootfs-etc-ssh-sshd_config.d-50-postmarketos-ui-policy.conf 1b8add60574ec4644197cb93263c0653325c2e88e03673de918be5fb3280c7b81e8e97dce498850a07f2f3307771c44f3c876922e5cbd5207523ede31816296f rootfs-usr-lib-NetworkManager-system-connections-USB_Networking.nmconnection d1ddd43489e6016e3ffd716027ed2bae4a2ab5f213118bdbcb96750e267ab7c0367cd0e0e386300aa5550352653144f5caeddd790621fe0879f83ca1995bb65c rootfs-etc-tinydm.d-env-wayland.d-50-firefox-wayland.sh ecaa57d033a119a53a6574c27636b7c89d659d75ea48a973a6a4ff6f90e5d07202529fd489bfc9dfc7430f5b60f40612f6d5c06f7fab47e681b0a3112a874058 rootfs-etc-tinydm.d-env-wayland.d-50-sdl-wayland.sh diff --git a/main/postmarketos-base-ui/rootfs-etc-ssh-sshd_config.d-50-postmarketos-ui-policy.conf b/main/postmarketos-base-ui/rootfs-etc-ssh-sshd_config.d-50-postmarketos-ui-policy.conf new file mode 100644 index 000000000..6ac35e318 --- /dev/null +++ b/main/postmarketos-base-ui/rootfs-etc-ssh-sshd_config.d-50-postmarketos-ui-policy.conf @@ -0,0 +1 @@ +UsePAM yes diff --git a/main/postmarketos-base-ui/rootfs-etc-ssh-sshd_config.d-postmarketos-ui-policy.conf b/main/postmarketos-base-ui/rootfs-etc-ssh-sshd_config.d-postmarketos-ui-policy.conf deleted file mode 100644 index 0dc8eff2a..000000000 --- a/main/postmarketos-base-ui/rootfs-etc-ssh-sshd_config.d-postmarketos-ui-policy.conf +++ /dev/null @@ -1 +0,0 @@ -UsePAM yes \ No newline at end of file