nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add environment.etcBackupExtension option

Browse source
This commit is contained in:
Tobias Happ 2019-11-30 01:30:33 +01:00 • committed by Alexander Sosedkin
parent 6c80065616
commit 15f5d97457
3 changed files with 45 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/build/initial-build/nix-on-droid.nix.default
View file

@ -24,6 +24,9 @@
#unzip #unzip
]; ];
# Backup etc files instead of failing to activate generation if a file already exists in /etc
environment.etcBackupExtension = ".bak";
# Read the changelog before changing this value # Read the changelog before changing this value
system.stateVersion = "19.09"; system.stateVersion = "19.09";

47
modules/environment/etc/default.nix
View file

@ -72,20 +72,37 @@ in
options = { options = {
environment.etc = mkOption { environment = {
type = types.loaOf fileType; etc = mkOption {
default = {}; type = types.loaOf fileType;
example = literalExample '' default = {};
{ example = literalExample ''
example-configuration-file = { {
source = "/nix/store/.../etc/dir/file.conf.example"; example-configuration-file = {
}; source = "/nix/store/.../etc/dir/file.conf.example";
"default/useradd".text = "GROUP=100 ..."; };
} "default/useradd".text = "GROUP=100 ...";
''; }
description = '' '';
Set of files that have to be linked in <filename>/etc</filename>. description = ''
''; Set of files that have to be linked in <filename>/etc</filename>.
'';
};
etcBackupExtension = mkOption {
type = types.nullOr types.str;
default = null;
example = ".bak";
description = ''
Backup file extension.
</para><para>
If a file in <filename>/etc</filename> already exists and is not managed
by nix-on-droid, the activation fails because we do not overwrite unknown
files. When an extension is provided through this option, the original
file will be moved in respect of the backup extension and the activation
executes successfully.
'';
};
}; };
}; };
@ -99,7 +116,7 @@ in
inherit etc; inherit etc;
activation.setUpEtc = '' activation.setUpEtc = ''
$DRY_RUN_CMD bash ${./setup-etc.sh} /etc ${etc}/etc $DRY_RUN_CMD bash ${./setup-etc.sh} /etc ${etc}/etc ${config.environment.etcBackupExtension}
''; '';
}; };

12
modules/environment/etc/setup-etc.sh
View file

@ -6,6 +6,7 @@
etc="${1}" etc="${1}"
static="/etc/static" static="/etc/static"
new_etc="${2}" new_etc="${2}"
backup_extension="${3:-}"
function atomic_symlink() { function atomic_symlink() {
local source="${1}" local source="${1}"
@ -25,7 +26,7 @@ function cleanup() {
for file in $(find "${etc}" -xtype l); do for file in $(find "${etc}" -xtype l); do
local target="$(readlink "${file}")" local target="$(readlink "${file}")"
if [[ ! -L "${target}" ]]; then if [[ ! -L "${target}" ]]; then
echo "removing obsolete symlink '${file}'..." echo "Removing obsolete symlink '${file}'..."
rm "${file}" rm "${file}"
fi fi
done done
@ -64,7 +65,14 @@ function link() {
mkdir -p "$(dirname "${target}")" mkdir -p "$(dirname "${target}")"
if [[ -e "${target}" ]] && ! is_static "${target}"; then if [[ -e "${target}" ]] && ! is_static "${target}"; then
echo "Linking of ${target} failed. Please remove this file." if [[ -n "${backup_extension}" ]]; then
echo "Backing up '${target}' to '${target}${backup_extension}'..."
cp "${target}" "${target}${backup_extension}"
atomic_symlink "${static}/${name}" "${target}"
else
echo "Linking of ${target} failed. Please remove this file."
fi
else else
atomic_symlink "${static}/${name}" "${target}" atomic_symlink "${static}/${name}" "${target}"
fi fi