From 71c7d66a5fcc1dc44665741dd264ba2c6a5524c5 Mon Sep 17 00:00:00 2001
From: hc <hc@email.ch>
Date: Thu, 12 Dec 2024 12:22:42 +0800
Subject: newvm.sh2stable

---
 others/vm.sh2 | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'others/vm.sh2')

diff --git a/others/vm.sh2 b/others/vm.sh2
index 8e899fa..fe3eec0 100755
--- a/others/vm.sh2
+++ b/others/vm.sh2
@@ -131,11 +131,7 @@ case "$1" in
 
     echo '  - sudo growpart /dev/sda 1' >> user-data
     echo '  - sudo xfs_growfs /' >> user-data
-<<<<<<< HEAD
     echo '  - sudo dnf install -y vim git' >> user-data
-=======
-    echo '  - sudo dnf install -y git' >> user-data
->>>>>>> 1f9a6a4 (update)
     echo '  - cd /home/fedora' >> user-data
     echo '  - git clone https://git.0nom.ch/setup' >> user-data
     echo '  - sudo ./setup/setup.sh' >> user-data
@@ -146,15 +142,9 @@ case "$1" in
     genisoimage -output "$seed_iso" -volid cidata -joliet -rock user-data meta-data &> /dev/null || { echo "Failed to create seed.iso."; exit 1; }
 
     sudo cp $src_file $NEW_IMG_PATH &> /dev/null || { echo "Failed to create a new image."; exit 1; }
-<<<<<<< HEAD
     
     if sudo virsh list --all | awk "\$2==\"$VM_NAME\"" | grep -q .; then
    # if sudo virsh list --all | grep -q "$VM_NAME"; then
-=======
-
-    if sudo virsh list --all | awk "\$2==\"$VM_NAME\"" | grep -q .; then
-    #if sudo virsh list --all | grep -q "$VM_NAME"; then
->>>>>>> 1f9a6a4 (update)
       echo -e "\n$VM_NAME already exist. Delete it using \n$0 manage -erase $VM_NAME\nExiting..."
       exit 1
     fi
-- 
cgit v1.2.3-70-g09d2