mirror of
				https://github.com/suiryc/archlinux-initrd-ssh-cryptsetup.git
				synced 2025-11-04 10:12:33 +03:00 
			
		
		
		
	Try to print network devices information when interface setup fails
Useful to check interfaces name and MAC address. v0.9-1
This commit is contained in:
		@@ -1,3 +1,9 @@
 | 
				
			|||||||
 | 
					2021-10-24 Julien Coloos <julien.coloos [at] gmail [dot] com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        * v0.9-1
 | 
				
			||||||
 | 
					        Try to print network devices information when interface setup fails
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2021-08-15 Julien Coloos <julien.coloos [at] gmail [dot] com>
 | 
					2021-08-15 Julien Coloos <julien.coloos [at] gmail [dot] com>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        * v0.8-1
 | 
					        * v0.8-1
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								PKGBUILD
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								PKGBUILD
									
									
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
				
			|||||||
# Maintainer: Julien Coloos <julien.coloos [at] gmail [dot] com>
 | 
					# Maintainer: Julien Coloos <julien.coloos [at] gmail [dot] com>
 | 
				
			||||||
pkgname=initrd-ssh-cryptsetup
 | 
					pkgname=initrd-ssh-cryptsetup
 | 
				
			||||||
pkgver=0.8
 | 
					pkgver=0.9
 | 
				
			||||||
pkgrel=1
 | 
					pkgrel=1
 | 
				
			||||||
pkgdesc="Allows for LUKS-encrypted devices to be unlocked remotely over SSH"
 | 
					pkgdesc="Allows for LUKS-encrypted devices to be unlocked remotely over SSH"
 | 
				
			||||||
arch=('any')
 | 
					arch=('any')
 | 
				
			||||||
@@ -10,7 +10,7 @@ depends=('dropbear' 'cryptsetup' 'mkinitcpio-nfs-utils' 'iproute2')
 | 
				
			|||||||
install=$pkgname.install
 | 
					install=$pkgname.install
 | 
				
			||||||
changelog='ChangeLog'
 | 
					changelog='ChangeLog'
 | 
				
			||||||
source=("http://julien.coloos.free.fr/archlinux/$pkgname-$pkgver.tar.xz" "$pkgname.install")
 | 
					source=("http://julien.coloos.free.fr/archlinux/$pkgname-$pkgver.tar.xz" "$pkgname.install")
 | 
				
			||||||
md5sums=('ac5a53fbc288ccce61874488bcbbf58a'
 | 
					md5sums=('c94a905ca91f7afe2c0f771bd5182cb2'
 | 
				
			||||||
         'ac60109d80e7bb2af0d66e69aaf178a6')
 | 
					         'ac60109d80e7bb2af0d66e69aaf178a6')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
package() {
 | 
					package() {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,6 +30,7 @@ As explained upon installation, the following things need to be done:
 | 
				
			|||||||
   * add the authorized SSH public key to `/etc/dropbear/initrd.authorized_keys`
 | 
					   * add the authorized SSH public key to `/etc/dropbear/initrd.authorized_keys`
 | 
				
			||||||
   * add the `ip=` kernel command parameter to the bootloader configuration (see https://wiki.archlinux.org/index.php/Mkinitcpio#Using_net)
 | 
					   * add the `ip=` kernel command parameter to the bootloader configuration (see https://wiki.archlinux.org/index.php/Mkinitcpio#Using_net)
 | 
				
			||||||
      - e.g. with `grub`: add `ip=:::::eth0:dhcp` to `GRUB_CMDLINE_LINUX_DEFAULT` in `/etc/default/grub`, and re-generate the configuration with `grub-mkconfig -o /boot/grub/grub.cfg`
 | 
					      - e.g. with `grub`: add `ip=:::::eth0:dhcp` to `GRUB_CMDLINE_LINUX_DEFAULT` in `/etc/default/grub`, and re-generate the configuration with `grub-mkconfig -o /boot/grub/grub.cfg`
 | 
				
			||||||
 | 
					      - also see https://git.kernel.org/pub/scm/libs/klibc/klibc.git/tree/usr/kinit/ipconfig/README.ipconfig
 | 
				
			||||||
   * in the `HOOKS` section of `/etc/mkinitcpio.conf`, add `ssh-cryptsetup` before `filesystems`; then rebuild the initramfs: `mkinitcpio -p linux`
 | 
					   * in the `HOOKS` section of `/etc/mkinitcpio.conf`, add `ssh-cryptsetup` before `filesystems`; then rebuild the initramfs: `mkinitcpio -p linux`
 | 
				
			||||||
      - when using a non-standard keyboard layout, it is also useful to add the `keymap` hook before `ssh-cryptsetup`, and also move `keyboard` before `keymap`
 | 
					      - when using a non-standard keyboard layout, it is also useful to add the `keymap` hook before `ssh-cryptsetup`, and also move `keyboard` before `keymap`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -58,7 +59,7 @@ For example:
 | 
				
			|||||||
## Building notes
 | 
					## Building notes
 | 
				
			||||||
1. Modify the sources (features in `src`, and/or package building files)
 | 
					1. Modify the sources (features in `src`, and/or package building files)
 | 
				
			||||||
2. If `src` was modified
 | 
					2. If `src` was modified
 | 
				
			||||||
   * archive the `src` folder in `$pkgname-$pkgver.tar.xz` file; e.g.: `tar -cJf initrd-ssh-cryptsetup-0.7.tar.xz src`
 | 
					   * archive the `src` folder in `$pkgname-$pkgver.tar.xz` file; e.g.: `tar -cJf initrd-ssh-cryptsetup-0.9.tar.xz src`
 | 
				
			||||||
   * upload the archive on the online repository (pointed by `PKGBUILD`)
 | 
					   * upload the archive on the online repository (pointed by `PKGBUILD`)
 | 
				
			||||||
3. Update ChangeLog
 | 
					3. Update ChangeLog
 | 
				
			||||||
4. Update `PKGBUILD`
 | 
					4. Update `PKGBUILD`
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -40,9 +40,12 @@ sshcs_net_start() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    echo ""
 | 
					    echo ""
 | 
				
			||||||
    echo "Configuring IP (timeout = ${sshcs_opt_timeout_ipconfig}s) ..."
 | 
					    echo "Configuring IP (timeout = ${sshcs_opt_timeout_ipconfig}s) ..."
 | 
				
			||||||
 | 
					    # ipconfig manual: https://git.kernel.org/pub/scm/libs/klibc/klibc.git/tree/usr/kinit/ipconfig/README.ipconfig
 | 
				
			||||||
    ipconfig_out=$(ipconfig -t "${sshcs_opt_timeout_ipconfig}" "ip=${ip}")
 | 
					    ipconfig_out=$(ipconfig -t "${sshcs_opt_timeout_ipconfig}" "ip=${ip}")
 | 
				
			||||||
    if [ $? -ne 0 ]; then
 | 
					    if [ $? -ne 0 ]; then
 | 
				
			||||||
        err "IP configuration timeout!"
 | 
					        err "IP configuration timeout!"
 | 
				
			||||||
 | 
					        echo "Devices probing:"
 | 
				
			||||||
 | 
					        ipconfig -n -t 5 -c none all
 | 
				
			||||||
        return 1
 | 
					        return 1
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user