Last active 1709552897

codgician revised this gist 1709552897. Go to revision

1 file changed, 3 insertions

immortalwrt-upgrade.sh

@@ -13,8 +13,11 @@ pkgConfig="-dnsmasq dnsmasq-full ip-full vim vim-runtime -ethtool ethtool-full \
13 13 kmod-nf-nat kmod-nf-nat6 kmod-tls kmod-nft-arp kmod-nft-compat kmod-nft-connlimit kmod-nft-dup-inet kmod-nft-queue kmod-nft-socket kmod-nft-tproxy kmod-nft-xfrm kmod-nft-offload \
14 14 iptables-nft ip6tables-nft kmod-ipt-nat6 kmod-ipt-nat-extra kmod-ipt-nathelper-rtsp kmod-sched-mqprio kmod-ipt-offload \
15 15 kmod-e1000 kmod-e1000e kmod-igb kmod-ixgbe kmod-ixgbevf kmod-igc \
16 + # Bare-metal installation:
16 17 # intel-microcode iucode-tool kmod-i2c-i801 kmod-w83627hf-wdt kmod-itco-wdt \
18 + # ESXi installation:
17 19 # kmod-vmxnet3 open-vm-tools open-vm-tools-fuse \
20 + # Proxmox VE installtion:
18 21 # virtio-console-helper qemu-ga \
19 22 kmod-usb2 kmod-usb3 usbutils exfat-fsck exfat-mkfs kmod-fs-exfat kmod-usb-storage kmod-usb-storage-extras kmod-usb-storage-uas kmod-usb-serial kmod-usb-hid \
20 23 luci-i18n-opkg-zh-cn luci-i18n-firewall-zh-cn \

codgician revised this gist 1709552624. Go to revision

1 file changed, 1 insertion, 1 deletion

immortalwrt-upgrade.sh

@@ -9,7 +9,7 @@ routerIp="192.168.0.1"
9 9 version="23.05.1"
10 10 baseUrl="https://downloads.immortalwrt.org/releases/${version}/targets/x86/64/"
11 11 builderFileName="immortalwrt-imagebuilder-${version}-x86-64.Linux-x86_64.tar.xz"
12 - pkgConfig="-dnsmasq dnsmasq-full ip-full vim vim-runtime -ethtool kmod-e1000ethtool-full \
12 + pkgConfig="-dnsmasq dnsmasq-full ip-full vim vim-runtime -ethtool ethtool-full \
13 13 kmod-nf-nat kmod-nf-nat6 kmod-tls kmod-nft-arp kmod-nft-compat kmod-nft-connlimit kmod-nft-dup-inet kmod-nft-queue kmod-nft-socket kmod-nft-tproxy kmod-nft-xfrm kmod-nft-offload \
14 14 iptables-nft ip6tables-nft kmod-ipt-nat6 kmod-ipt-nat-extra kmod-ipt-nathelper-rtsp kmod-sched-mqprio kmod-ipt-offload \
15 15 kmod-e1000 kmod-e1000e kmod-igb kmod-ixgbe kmod-ixgbevf kmod-igc \

codgician revised this gist 1709552065. Go to revision

1 file changed, 2 insertions, 2 deletions

immortalwrt-upgrade.sh

@@ -29,8 +29,8 @@ luci-app-statistics luci-i18n-statistics-zh-cn collectd-mod-disk collectd-mod-cp
29 29 umdns ca-bundle haveged wget wget-ssl iperf3 telnet-bsd speedtest-cli qrencode lm-sensors-detect lscpu lsblk uhubctl losetup bind-dig httping tcping \
30 30 "
31 31
32 - eval `ssh-agent -s`
33 - ssh-add ~/.ssh/codgi-ssh.pem
32 + # eval `ssh-agent -s`
33 + # ssh-add ~/.ssh/codgi-ssh.pem
34 34
35 35 echo "# STEP 1. Downloading OpenWrt ${version} Image Builder ..."
36 36

codgician revised this gist 1709552036. Go to revision

1 file changed, 1 insertion

immortalwrt-upgrade.sh

@@ -26,6 +26,7 @@ luci-app-watchcat luci-i18n-watchcat-zh-cn \
26 26 luci-app-uhttpd uhttpd \
27 27 luci-theme-bootstrap luci-theme-argon \
28 28 luci-app-statistics luci-i18n-statistics-zh-cn collectd-mod-disk collectd-mod-cpu collectd-mod-cpufreq collectd-mod-df collectd-mod-interface collectd-mod-processes collectd-mod-uptime collectd-mod-vmem collectd-mod-email collectd-mod-ethstat collectd-mod-conntrack collectd-mod-dhcpleases collectd-mod-syslog collectd-mod-write-http collectd-mod-ping collectd-mod-dns collectd-mod-memory collectd-mod-thermal collectd-mod-sensors collectd-mod-smart smartmontools smartmontools-drivedb \
29 + umdns ca-bundle haveged wget wget-ssl iperf3 telnet-bsd speedtest-cli qrencode lm-sensors-detect lscpu lsblk uhubctl losetup bind-dig httping tcping \
29 30 "
30 31
31 32 eval `ssh-agent -s`

codgician revised this gist 1709551985. Go to revision

1 file changed, 1 insertion, 1 deletion

immortalwrt-upgrade.sh

@@ -25,7 +25,7 @@ luci-app-banip luci-i18n-banip-zh-cn \
25 25 luci-app-watchcat luci-i18n-watchcat-zh-cn \
26 26 luci-app-uhttpd uhttpd \
27 27 luci-theme-bootstrap luci-theme-argon \
28 - luci-app-statistics luci-i18n-statistics-zh-cn collectd-mod-disk collectd-mod-cpu collectd-mod-cpufreq collectd-mod-df collectd-mod-interface collectd-mod-processes collectd-mod-uptime collectd-mod-vmem collectd-mod-email collectd-mod-ethstat collectd-mod-conntrack collectd-mod-dhcpleases collectd-mod-syslog collectd-mod-write-http collectd-mod-ping collectd-mod-dns collectd-mod-memory collectd-mod-thermal collectd-mod-nginx collectd-mod-sensors collectd-mod-smart smartmontools smartmontools-drivedb \
28 + luci-app-statistics luci-i18n-statistics-zh-cn collectd-mod-disk collectd-mod-cpu collectd-mod-cpufreq collectd-mod-df collectd-mod-interface collectd-mod-processes collectd-mod-uptime collectd-mod-vmem collectd-mod-email collectd-mod-ethstat collectd-mod-conntrack collectd-mod-dhcpleases collectd-mod-syslog collectd-mod-write-http collectd-mod-ping collectd-mod-dns collectd-mod-memory collectd-mod-thermal collectd-mod-sensors collectd-mod-smart smartmontools smartmontools-drivedb \
29 29 "
30 30
31 31 eval `ssh-agent -s`

codgician revised this gist 1709551970. Go to revision

1 file changed, 3 insertions, 4 deletions

immortalwrt-upgrade.sh

@@ -18,15 +18,14 @@ kmod-e1000 kmod-e1000e kmod-igb kmod-ixgbe kmod-ixgbevf kmod-igc \
18 18 # virtio-console-helper qemu-ga \
19 19 kmod-usb2 kmod-usb3 usbutils exfat-fsck exfat-mkfs kmod-fs-exfat kmod-usb-storage kmod-usb-storage-extras kmod-usb-storage-uas kmod-usb-serial kmod-usb-hid \
20 20 luci-i18n-opkg-zh-cn luci-i18n-firewall-zh-cn \
21 - luci-i18n-passwall2-zh-cn luci-app-passwall2 xray-core \
21 + luci-i18n-passwall-zh-cn luci-app-passwall xray-core \
22 22 luci-app-upnp luci-i18n-upnp-zh-cn \
23 23 luci-app-wol luci-i18n-wol-zh-cn \
24 24 luci-app-banip luci-i18n-banip-zh-cn \
25 25 luci-app-watchcat luci-i18n-watchcat-zh-cn \
26 26 luci-app-uhttpd uhttpd \
27 - luci-theme-bootstrap \
28 - luci-app-statistics luci-i18n-statistics-zh-cn collectd-mod-disk collectd-mod-cpu collectd-mod-cpufreq collectd-mod-df collectd-mod-interface collectd-mod-processes collectd-mod-uptime collectd-mod-vmem collectd-mod-email collectd-mod-ethstat collectd-mod-conntrack collectd-mod-dhcpleases collectd-mod-syslog collectd-mod-write-http collectd-mod-ping collectd-mod-dns collectd-mod-memory collectd-mod-thermal collectd-mod-nginx collectd-mod-sensors collectd-mod-smart smartmontools smartmontools-drivedb collectd-mod-nut \
29 - postfix ca-bundle haveged wget wget-ssl iperf3 telnet-bsd qrencode lm-sensors-detect lscpu lsblk uhubctl losetup bind-dig tcping httping \
27 + luci-theme-bootstrap luci-theme-argon \
28 + luci-app-statistics luci-i18n-statistics-zh-cn collectd-mod-disk collectd-mod-cpu collectd-mod-cpufreq collectd-mod-df collectd-mod-interface collectd-mod-processes collectd-mod-uptime collectd-mod-vmem collectd-mod-email collectd-mod-ethstat collectd-mod-conntrack collectd-mod-dhcpleases collectd-mod-syslog collectd-mod-write-http collectd-mod-ping collectd-mod-dns collectd-mod-memory collectd-mod-thermal collectd-mod-nginx collectd-mod-sensors collectd-mod-smart smartmontools smartmontools-drivedb \
30 29 "
31 30
32 31 eval `ssh-agent -s`

codgician revised this gist 1709551878. Go to revision

1 file changed, 2 insertions, 2 deletions

immortalwrt-upgrade.sh

@@ -12,8 +12,8 @@ builderFileName="immortalwrt-imagebuilder-${version}-x86-64.Linux-x86_64.tar.xz"
12 12 pkgConfig="-dnsmasq dnsmasq-full ip-full vim vim-runtime -ethtool kmod-e1000ethtool-full \
13 13 kmod-nf-nat kmod-nf-nat6 kmod-tls kmod-nft-arp kmod-nft-compat kmod-nft-connlimit kmod-nft-dup-inet kmod-nft-queue kmod-nft-socket kmod-nft-tproxy kmod-nft-xfrm kmod-nft-offload \
14 14 iptables-nft ip6tables-nft kmod-ipt-nat6 kmod-ipt-nat-extra kmod-ipt-nathelper-rtsp kmod-sched-mqprio kmod-ipt-offload \
15 - intel-microcode iucode-tool kmod-kvm-intel kmod-i2c-i801 kmod-e1000 kmod-e1000e kmod-igb kmod-ixgbe kmod-ixgbevf kmod-igc \
16 - kmod-w83627hf-wdt kmod-itco-wdt \
15 + kmod-e1000 kmod-e1000e kmod-igb kmod-ixgbe kmod-ixgbevf kmod-igc \
16 + # intel-microcode iucode-tool kmod-i2c-i801 kmod-w83627hf-wdt kmod-itco-wdt \
17 17 # kmod-vmxnet3 open-vm-tools open-vm-tools-fuse \
18 18 # virtio-console-helper qemu-ga \
19 19 kmod-usb2 kmod-usb3 usbutils exfat-fsck exfat-mkfs kmod-fs-exfat kmod-usb-storage kmod-usb-storage-extras kmod-usb-storage-uas kmod-usb-serial kmod-usb-hid \

codgician revised this gist 1709551814. Go to revision

1 file changed, 2 insertions, 1 deletion

immortalwrt-upgrade.sh

@@ -14,7 +14,8 @@ kmod-nf-nat kmod-nf-nat6 kmod-tls kmod-nft-arp kmod-nft-compat kmod-nft-connlimi
14 14 iptables-nft ip6tables-nft kmod-ipt-nat6 kmod-ipt-nat-extra kmod-ipt-nathelper-rtsp kmod-sched-mqprio kmod-ipt-offload \
15 15 intel-microcode iucode-tool kmod-kvm-intel kmod-i2c-i801 kmod-e1000 kmod-e1000e kmod-igb kmod-ixgbe kmod-ixgbevf kmod-igc \
16 16 kmod-w83627hf-wdt kmod-itco-wdt \
17 - kmod-vmxnet3 open-vm-tools open-vm-tools-fuse \
17 + # kmod-vmxnet3 open-vm-tools open-vm-tools-fuse \
18 + # virtio-console-helper qemu-ga \
18 19 kmod-usb2 kmod-usb3 usbutils exfat-fsck exfat-mkfs kmod-fs-exfat kmod-usb-storage kmod-usb-storage-extras kmod-usb-storage-uas kmod-usb-serial kmod-usb-hid \
19 20 luci-i18n-opkg-zh-cn luci-i18n-firewall-zh-cn \
20 21 luci-i18n-passwall2-zh-cn luci-app-passwall2 xray-core \

codgician revised this gist 1709551718. Go to revision

1 file changed, 2 insertions, 7 deletions

immortalwrt-upgrade.sh

@@ -52,11 +52,6 @@ cd ./builder
52 52 # mkdir ./backup
53 53 # tar xf ./backup.tar.gz -C ./backup/
54 54
55 - echo -e "src/gz passwall2 https://dodgix.github.io/openwrt-23.05.2/packages/x86/64/passwall2" > ~/repositories.conf
56 - echo -e "src/gz passwall_packages https://dodgix.github.io/openwrt-23.05.2/packages/x86/64/passwall_packages" > ~/repositories.conf
57 - echo -e "src/gz magnetty_core https://dodgix.github.io/openwrt-23.05.2/targets/86/64/packages/" > ~/repositories.conf
58 -
59 -
60 55 # Update custom feed
61 56 # sed -i "s/openwrt-[0-9]\{2\}.[0-9]\{2\}.[0-9]/openwrt-${version}/g" ./backup/etc/opkg/customfeeds.conf
62 57
@@ -74,8 +69,8 @@ sed -i "s/CONFIG_TARGET_ROOTFS_EXT4FS=y/CONFIG_TARGET_ROOTFS_EXT4FS=n/g" ./.conf
74 69 sed -i "s/CONFIG_VHDX_IMAGES=y/CONFIG_VHDX_IMAGES=n/g" ./.config
75 70 sed -i "s/CONFIG_QCOW2_IMAGES=y/CONFIG_QCOW2_IMAGES=n/g" ./.config
76 71 sed -i "s/CONFIG_ISO_IMAGES=y/CONFIG_ISO_IMAGES=n/g" ./.config
77 - sed -i "s/CONFIG_VMDK_IMAGES=y/CONFIG_VMDK_IMAGES=n/g" ./.config
78 - sed -i "s/CONFIG_VDI_IMAGES=y/CONFIG_VDI_IMAGES=n/g" ./.config
72 + #sed -i "s/CONFIG_VMDK_IMAGES=y/CONFIG_VMDK_IMAGES=n/g" ./.config
73 + #sed -i "s/CONFIG_VDI_IMAGES=y/CONFIG_VDI_IMAGES=n/g" ./.config
79 74
80 75 # Language config
81 76 sed -i "s/# CONFIG_LUCI_LANG_en is not set/CONFIG_LUCI_LANG_en=y/g" ./.config

codgician revised this gist 1709551690. Go to revision

1 file changed, 86 insertions

immortalwrt-upgrade.sh(file created)

@@ -0,0 +1,86 @@
1 + #!/bin/sh
2 + # ImmortalWrt image generation script
3 + # This is only intended for dot build upgrades!
4 + # Execute inside a new folder.
5 +
6 + # Parameters: change to your configuration!
7 + routerUser="root"
8 + routerIp="192.168.0.1"
9 + version="23.05.1"
10 + baseUrl="https://downloads.immortalwrt.org/releases/${version}/targets/x86/64/"
11 + builderFileName="immortalwrt-imagebuilder-${version}-x86-64.Linux-x86_64.tar.xz"
12 + pkgConfig="-dnsmasq dnsmasq-full ip-full vim vim-runtime -ethtool kmod-e1000ethtool-full \
13 + kmod-nf-nat kmod-nf-nat6 kmod-tls kmod-nft-arp kmod-nft-compat kmod-nft-connlimit kmod-nft-dup-inet kmod-nft-queue kmod-nft-socket kmod-nft-tproxy kmod-nft-xfrm kmod-nft-offload \
14 + iptables-nft ip6tables-nft kmod-ipt-nat6 kmod-ipt-nat-extra kmod-ipt-nathelper-rtsp kmod-sched-mqprio kmod-ipt-offload \
15 + intel-microcode iucode-tool kmod-kvm-intel kmod-i2c-i801 kmod-e1000 kmod-e1000e kmod-igb kmod-ixgbe kmod-ixgbevf kmod-igc \
16 + kmod-w83627hf-wdt kmod-itco-wdt \
17 + kmod-vmxnet3 open-vm-tools open-vm-tools-fuse \
18 + kmod-usb2 kmod-usb3 usbutils exfat-fsck exfat-mkfs kmod-fs-exfat kmod-usb-storage kmod-usb-storage-extras kmod-usb-storage-uas kmod-usb-serial kmod-usb-hid \
19 + luci-i18n-opkg-zh-cn luci-i18n-firewall-zh-cn \
20 + luci-i18n-passwall2-zh-cn luci-app-passwall2 xray-core \
21 + luci-app-upnp luci-i18n-upnp-zh-cn \
22 + luci-app-wol luci-i18n-wol-zh-cn \
23 + luci-app-banip luci-i18n-banip-zh-cn \
24 + luci-app-watchcat luci-i18n-watchcat-zh-cn \
25 + luci-app-uhttpd uhttpd \
26 + luci-theme-bootstrap \
27 + luci-app-statistics luci-i18n-statistics-zh-cn collectd-mod-disk collectd-mod-cpu collectd-mod-cpufreq collectd-mod-df collectd-mod-interface collectd-mod-processes collectd-mod-uptime collectd-mod-vmem collectd-mod-email collectd-mod-ethstat collectd-mod-conntrack collectd-mod-dhcpleases collectd-mod-syslog collectd-mod-write-http collectd-mod-ping collectd-mod-dns collectd-mod-memory collectd-mod-thermal collectd-mod-nginx collectd-mod-sensors collectd-mod-smart smartmontools smartmontools-drivedb collectd-mod-nut \
28 + postfix ca-bundle haveged wget wget-ssl iperf3 telnet-bsd qrencode lm-sensors-detect lscpu lsblk uhubctl losetup bind-dig tcping httping \
29 + "
30 +
31 + eval `ssh-agent -s`
32 + ssh-add ~/.ssh/codgi-ssh.pem
33 +
34 + echo "# STEP 1. Downloading OpenWrt ${version} Image Builder ..."
35 +
36 + # Download OpenWrt image builder and extract
37 + if ! [ -f "./${builderFileName}" ]
38 + then
39 + wget "$baseUrl/$builderFileName" -P .
40 + fi
41 + rm -rf ./builder
42 + mkdir ./builder
43 + tar xf ./$builderFileName -C ./builder/ --strip-components=1
44 + cd ./builder
45 +
46 + # echo "# STEP 2. Backing up current configurations ..."
47 +
48 + # Backup configurations from router
49 + # routerSsh="${routerUser}@${routerIp}"
50 + # ssh ${routerSsh} 'sysupgrade -b ~/backup.tar.gz'
51 + # scp -O "${routerSsh}:~/backup.tar.gz" ./ || exit 1
52 + # mkdir ./backup
53 + # tar xf ./backup.tar.gz -C ./backup/
54 +
55 + echo -e "src/gz passwall2 https://dodgix.github.io/openwrt-23.05.2/packages/x86/64/passwall2" > ~/repositories.conf
56 + echo -e "src/gz passwall_packages https://dodgix.github.io/openwrt-23.05.2/packages/x86/64/passwall_packages" > ~/repositories.conf
57 + echo -e "src/gz magnetty_core https://dodgix.github.io/openwrt-23.05.2/targets/86/64/packages/" > ~/repositories.conf
58 +
59 +
60 + # Update custom feed
61 + # sed -i "s/openwrt-[0-9]\{2\}.[0-9]\{2\}.[0-9]/openwrt-${version}/g" ./backup/etc/opkg/customfeeds.conf
62 +
63 + echo "# STEP 3. Preparing to build image ..."
64 +
65 + # Add custom feeds to builder
66 + # cat ./backup/etc/opkg/customfeeds.conf >> ./repositories.conf
67 + # cp ./backup/etc/opkg/keys/* ./keys
68 +
69 + # Set grub timeout to 0
70 + sed -i 's/CONFIG_GRUB_TIMEOUT="[0-9]"/CONFIG_GRUB_TIMEOUT="0"/g' ./.config
71 +
72 + # Image generation config
73 + sed -i "s/CONFIG_TARGET_ROOTFS_EXT4FS=y/CONFIG_TARGET_ROOTFS_EXT4FS=n/g" ./.config
74 + sed -i "s/CONFIG_VHDX_IMAGES=y/CONFIG_VHDX_IMAGES=n/g" ./.config
75 + sed -i "s/CONFIG_QCOW2_IMAGES=y/CONFIG_QCOW2_IMAGES=n/g" ./.config
76 + sed -i "s/CONFIG_ISO_IMAGES=y/CONFIG_ISO_IMAGES=n/g" ./.config
77 + sed -i "s/CONFIG_VMDK_IMAGES=y/CONFIG_VMDK_IMAGES=n/g" ./.config
78 + sed -i "s/CONFIG_VDI_IMAGES=y/CONFIG_VDI_IMAGES=n/g" ./.config
79 +
80 + # Language config
81 + sed -i "s/# CONFIG_LUCI_LANG_en is not set/CONFIG_LUCI_LANG_en=y/g" ./.config
82 +
83 + echo "# STEP 4. Building image ..."
84 + make image FILES="backup" PACKAGES="$pkgConfig" ROOTFS_PARTSIZE=1024 j=32 V=sc
85 +
86 + echo "# DONE. See built images under: ./builder/bin/targets/x86/64/"
Newer Older