gh_mirrors/reinstall
1
0
Fork 0
mirror of https://github.com/bin456789/reinstall.git synced 2025-01-19 04:49:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: 放置 cloud-init 配置时，删除注释

Browse Source
This commit is contained in:
bin456789 2023-10-22 00:46:53 +08:00
parent 5252f1e581
commit 250a7e26de
No known key found for this signature in database
GPG Key ID: EE301B386DE6C11B
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nocloud.yaml → cloud-init.yaml
View File

@ -20,7 +20,6 @@ runcmd:
# opensuse tumbleweed 有 /etc/ssh/sshd_config.d/ 文件夹，但没有 /etc/ssh/sshd_config，但有/usr/etc/ssh/sshd_config # opensuse tumbleweed 有 /etc/ssh/sshd_config.d/ 文件夹，但没有 /etc/ssh/sshd_config，但有/usr/etc/ssh/sshd_config
- grep 'Include.*/etc/ssh/sshd_config.d' /etc/sshd_config && echo "PermitRootLogin yes" >/etc/ssh/sshd_config.d/01-permitrootlogin.conf || echo "PermitRootLogin yes" >>/etc/ssh/sshd_config - grep 'Include.*/etc/ssh/sshd_config.d' /etc/sshd_config && echo "PermitRootLogin yes" >/etc/ssh/sshd_config.d/01-permitrootlogin.conf || echo "PermitRootLogin yes" >>/etc/ssh/sshd_config
- systemctl restart sshd - systemctl restart sshd
# ubuntu 镜像运行 echo -e '\nDone' ，-e 会被显示出来
- echo >/dev/tty0
- echo Done >/dev/tty0
- touch /etc/cloud/cloud-init.disabled - touch /etc/cloud/cloud-init.disabled
# ubuntu 镜像运行 echo -e '\nDone' ，-e 会被显示出来
- printf '\n%s\n' 'done' >/dev/console

7
trans.sh
View File

@ -747,10 +747,11 @@ EOF
download_cloud_init_config() { download_cloud_init_config() {
os_dir=$1 os_dir=$1
ci_file=$os_dir/etc/cloud/cloud.cfg.d/99_nocloud.cfg
# shellcheck disable=SC2154 ci_file=$os_dir/etc/cloud/cloud.cfg.d/99_nocloud.cfg
download $confhome/nocloud.yaml $ci_file download $confhome/cloud-init.yaml $ci_file
# 删除注释行，除了第一行
sed -i '1!{/^[[:space:]]*#/d}' $ci_file
# swapfile # swapfile
# 如果分区表中已经有swapfile就跳过，例如arch # 如果分区表中已经有swapfile就跳过，例如arch