opensuse: 修复禁用了 cloud-init 后，弹出了 jeos-firstboot

trans.sh

@@ -205,7 +205,8 @@ update_part() {
     # 因此要先停止 mdev 服务
     # 还要删除 /dev/$xda*?
     ensure_service_stopped mdev
-    rm -rf /dev/disk/*
+    # 即使停止了 mdev，有时也会报 Directory not empty，因此添加 retry
+    retry 5 rm -rf /dev/disk/*
 
     # 没挂载 modloop 时会提示
     # modprobe: can't change directory to '/lib/modules': No such file or directory
@@ -2698,6 +2699,21 @@ disable_cloud_init() {
     done
 }
 
+disable_jeos_firstboot() {
+    os_dir=$1
+    info "Disable JeOS Firstboot"
+
+    # 两种方法都可以
+    # https://github.com/openSUSE/jeos-firstboot?tab=readme-ov-file#usage
+
+    rm -rf $os_dir/var/lib/YaST2/reconfig_system
+
+    for name in jeos-firstboot jeos-firstboot-snapshot; do
+        # 服务不存在时会报错
+        chroot $os_dir systemctl disable "$name.service" 2>/dev/null || true
+    done
+}
+
 create_network_manager_config() {
     source_cfg=$1
     os_dir=$2
@@ -2952,6 +2968,7 @@ EOF
         find_and_mount /boot/efi
 
         disable_cloud_init $os_dir
+        disable_jeos_firstboot $os_dir
 
         # opensuse leap
         if grep opensuse-leap $os_dir/etc/os-release; then
@@ -3029,7 +3046,9 @@ EOF
         fi
 
         restore_resolv_conf $os_dir
-        swapoff $os_dir/swapfile
+
+        # 删除 swap
+        swapoff -a
         rm -f $os_dir/swapfile
     fi