main/postmarketos-base: rm write_unless_modified (MR 1398)
Get rid of the "write_unless_modified" code, which was supposed to only change /etc/fstab, /etc/issue, /etc/motd if the user did not modify it. This is nice in theory, but we have a bug report where the code did not do what it should (apk audit possibly failed due to a qemu bug?), and then it lead to strange bugs related to not having the expected /etc/fstab installed. Fixes: #661, #258
This commit is contained in:
parent
4cff95a5bb
commit
58ae4df2ef
2 changed files with 7 additions and 18 deletions
|
@ -1,6 +1,6 @@
|
||||||
pkgname=postmarketos-base
|
pkgname=postmarketos-base
|
||||||
pkgver=3
|
pkgver=3
|
||||||
pkgrel=34
|
pkgrel=35
|
||||||
pkgdesc="Meta package for minimal postmarketOS base"
|
pkgdesc="Meta package for minimal postmarketOS base"
|
||||||
url="https://postmarketos.org"
|
url="https://postmarketos.org"
|
||||||
arch="noarch"
|
arch="noarch"
|
||||||
|
|
|
@ -22,36 +22,25 @@ done
|
||||||
mkdir -p /run/openrc
|
mkdir -p /run/openrc
|
||||||
touch /run/openrc/shutdowntime
|
touch /run/openrc/shutdowntime
|
||||||
|
|
||||||
# Replace a config file from stock Alpine, unless apk reports that the user has
|
|
||||||
# modified it (note that this does not allow properly updating these configs
|
|
||||||
# when postmarketos-base gets updated yet, see issue pmaports#258).
|
|
||||||
write_unless_modified() {
|
|
||||||
# Redirect the stdin to the file unless it has been modified
|
|
||||||
# $1: file path
|
|
||||||
if apk audit "$(dirname "$1")" | grep -q "${1:1}"; then
|
|
||||||
echo "- NOT modifying (file was changed before): $1"
|
|
||||||
else
|
|
||||||
echo "- Modifying: $1"
|
|
||||||
cat > "$1"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Install /etc/fstab
|
# Install /etc/fstab
|
||||||
|
echo "- Modifying: /etc/fstab"
|
||||||
{
|
{
|
||||||
echo '# <file system> <mount point> <type> <options> <dump> <pass>'
|
echo '# <file system> <mount point> <type> <options> <dump> <pass>'
|
||||||
echo 'LABEL="pmOS_root" / ext4 relatime,data=ordered 0 1'
|
echo 'LABEL="pmOS_root" / ext4 relatime,data=ordered 0 1'
|
||||||
echo 'LABEL="pmOS_boot" /boot auto defaults 0 2'
|
echo 'LABEL="pmOS_boot" /boot auto defaults 0 2'
|
||||||
} | write_unless_modified /etc/fstab
|
} >/etc/fstab
|
||||||
|
|
||||||
# Set /etc/issue
|
# Set /etc/issue
|
||||||
|
echo "- Modifying: /etc/issue"
|
||||||
{
|
{
|
||||||
echo 'Welcome to postmarketOS'
|
echo 'Welcome to postmarketOS'
|
||||||
echo 'Kernel \r on an \m (\l)'
|
echo 'Kernel \r on an \m (\l)'
|
||||||
# setterm -powersave on -blank 5
|
# setterm -powersave on -blank 5
|
||||||
echo -ne "\033[9;5]"
|
echo -ne "\033[9;5]"
|
||||||
} | write_unless_modified /etc/issue
|
} >/etc/issue
|
||||||
|
|
||||||
# Set /etc/motd
|
# Set /etc/motd
|
||||||
|
echo "- Modifying: /etc/motd"
|
||||||
{
|
{
|
||||||
echo 'Welcome to postmarketOS!'
|
echo 'Welcome to postmarketOS!'
|
||||||
echo ''
|
echo ''
|
||||||
|
@ -62,7 +51,7 @@ write_unless_modified() {
|
||||||
echo ''
|
echo ''
|
||||||
echo 'You may change this message by editing /etc/motd.'
|
echo 'You may change this message by editing /etc/motd.'
|
||||||
echo ''
|
echo ''
|
||||||
} | write_unless_modified /etc/motd
|
} >/etc/motd
|
||||||
|
|
||||||
# Enable syslog to SHM. Note: size is 4048KiB, which *should* be More Than Enough(TM) for all but the most chattiest of devices.
|
# Enable syslog to SHM. Note: size is 4048KiB, which *should* be More Than Enough(TM) for all but the most chattiest of devices.
|
||||||
echo "- Modifying: /etc/conf.d/syslog"
|
echo "- Modifying: /etc/conf.d/syslog"
|
||||||
|
|
Loading…
Reference in a new issue