X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=keyscript-off;h=2984a2a7b0108acbb3d43757eb18e55015c8a365;hp=84f253c27e800674675af3d9ea4d429c92a5366a;hb=79b274fcd8bfa556133ab13270e84b40aebe8468;hpb=80be8ed466553bef7f47edf4d15a69ace460f3da diff --git a/keyscript-off b/keyscript-off index 84f253c..2984a2a 100755 --- a/keyscript-off +++ b/keyscript-off @@ -1,17 +1,6 @@ #!/bin/bash -# Copyright (C) 2016 Ian Kelling - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (C) 2019 Ian Kelling +# SPDX-License-Identifier: AGPL-3.0-or-later set -eE -o pipefail trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR @@ -31,7 +20,7 @@ if [[ $($sed -rn 's/^ID=(.*)/\1/p' /etc/os-release) == arch ]]; then else x=/root/keyscript if grep -q "${x}," /etc/crypttab; then - $sed -i "s#${x},#${x}-manual,#" /etc/crypttab + $sed -i "s#${x},#decrypt_keyctl,#" /etc/crypttab update-initramfs -u fi fi