From e1906c2cc4aa271d54651a298fff88be3d2016e7 Mon Sep 17 00:00:00 2001 From: xf0r3m Date: Thu, 4 Jan 2024 12:04:58 +0100 Subject: [PATCH] =?utf8?q?Usuni=C4=99cie=20polece=C5=84=20sudo=20z=20narz?= =?utf8?q?=C4=99dzi=20wymagaj=C4=85cych=20uprawnie=C5=84=20superu=C5=BCytk?= =?utf8?q?ownika=20-=20Ustawianie=20u=C5=BCytkownika=20cz.=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- tools/sbin/immudex-create-media | 2 +- tools/sbin/immudex-crypt | 26 +++++++------- tools/sbin/immudex-hostname | 6 ++-- tools/sbin/immudex-install | 64 ++++++++++++++++----------------- tools/sbin/immudex-padlock | 8 ++--- tools/sbin/immudex-upgrade | 16 ++++----- 6 files changed, 61 insertions(+), 61 deletions(-) diff --git a/tools/sbin/immudex-create-media b/tools/sbin/immudex-create-media index 94402d3..37a4c53 100755 --- a/tools/sbin/immudex-create-media +++ b/tools/sbin/immudex-create-media @@ -12,7 +12,7 @@ function help() { echo " (comapatible with immudex only iso images)"; echo " --nuke - write 0 to 1st megabyte of disk"; echo "Usage:"; - echo " $ create_media [--i386-efi] [--nuke] [iso_image]"; + echo " $ immudex-create-media [--i386-efi] [--nuke] [iso_image]"; } if [ "$1" ] && [ "$1" = "--i386-efi" ]; then target="i386-efi"; shift; fi diff --git a/tools/sbin/immudex-crypt b/tools/sbin/immudex-crypt index bdf2271..05656ef 100755 --- a/tools/sbin/immudex-crypt +++ b/tools/sbin/immudex-crypt @@ -27,7 +27,7 @@ function list() { if [ "$mapperDeviceList" ]; then for dmDevice in $mapperDeviceList; do - if sudo cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then + if cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then mountPoint=$(df --output=source,target /dev/mapper/${dmDevice} | tail -n 1 | awk '{printf $2}'); device=$(sudo cryptsetup status /dev/mapper/${dmDevice} | grep "device" | awk '{printf $2}'); if [ "$mountPoint" ] && [ "$mountPoint" != "/dev" ]; then @@ -69,24 +69,24 @@ function open() { else index=0; fi - sudo cryptsetup open $1 immudex-crypt${index}; - sudo mkdir -p /media/${USER}/immudex-crypt${index}; + cryptsetup open $1 immudex-crypt${index}; + mkdir -p /media/${USER}/immudex-crypt${index}; dmDevice=$(ls -l /dev/mapper/immudex-crypt${index} | awk '{printf $10}' | cut -d "/" -f 2); if ! $(sudo file -s /dev/${dmDevice} | grep -q 'ext4'); then echo "Could not determine filesystem of unlocked device."; echo -n "Format this device to ext4? (y/n): " read format; if [ "$format" = "y" ]; then - sudo mkfs.ext4 /dev/mapper/immudex-crypt${index}; + mkfs.ext4 /dev/mapper/immudex-crypt${index}; else echo "Refuse to mount."; - sudo cryptsetup close immudex-crypt${index}; + cryptsetup close immudex-crypt${index}; exit 1; fi fi - sudo mount /dev/mapper/immudex-crypt${index} /media/${USER}/immudex-crypt${index}; + mount /dev/mapper/immudex-crypt${index} /media/${USER}/immudex-crypt${index}; if [ ! -e /ic${index} ]; then - sudo ln -s /media/${USER}/immudex-crypt${index} /ic${index}; + ln -s /media/${USER}/immudex-crypt${index} /ic${index}; fi fi @@ -103,13 +103,13 @@ function close() { else cryptfsName=$1; fi - if sudo cryptsetup status /dev/mapper/${cryptfsName} > /dev/null 2>&1; then + if cryptsetup status /dev/mapper/${cryptfsName} > /dev/null 2>&1; then mountPoint=$(df --output=source,target /dev/mapper/${cryptfsName} | tail -1 | awk '{printf $2}'); if [ "$mountPoint" ] && [ "$mountPoint" != "/dev" ]; then - sudo umount -R $mountPoint; - sudo cryptsetup close ${cryptfsName}; + umount -R $mountPoint; + cryptsetup close ${cryptfsName}; else - sudo cryptsetup close ${cryptfsName}; + cryptsetup close ${cryptfsName}; fi else echo "Given devices isn't opened crypt device or it was closed before"; @@ -120,7 +120,7 @@ function close() { function create() { if [ $# -lt 1 ]; then help; exit 1; else - sudo cryptsetup -y -v luksFormat $1; + cryptsetup -y -v luksFormat $1; fi } @@ -134,7 +134,7 @@ function set_ownership(){ echo "User $USER is already owner of $mountPoint"; fi else - sudo chown ${USER}:${USER} $mountPoint; + chown ${USER}:${USER} $mountPoint; fi fi } diff --git a/tools/sbin/immudex-hostname b/tools/sbin/immudex-hostname index 83a3509..673397f 100755 --- a/tools/sbin/immudex-hostname +++ b/tools/sbin/immudex-hostname @@ -4,9 +4,9 @@ bootID=$(sed 's/-//g' /proc/sys/kernel/random/boot_id | cut -c 26-33); if hostnamectl > /dev/null 2>&1; then hName="$(hostnamectl | grep 'Chassis' | cut -d ":" -f 2 | awk '{printf $1}')-${bootID}"; else - hName="$(sudo dmidecode -s chassis-type | head -1 | tr [A-Z] [a-z])-${bootID}"; + hName="$(dmidecode -s chassis-type | head -1 | tr [A-Z] [a-z])-${bootID}"; fi -sudo hostnamectl set-hostname $hName; -sudo sed -i "s/immudex/${hName}/g" /etc/hosts; +hostnamectl set-hostname $hName; +sed -i "s/immudex/${hName}/g" /etc/hosts; echo $hName | sudo tee /etc/hostname > /dev/null; diff --git a/tools/sbin/immudex-install b/tools/sbin/immudex-install index 1902358..c2332d6 100755 --- a/tools/sbin/immudex-install +++ b/tools/sbin/immudex-install @@ -36,43 +36,43 @@ if $(sudo efibootmgr > /dev/null 2>&1); then originDisk=$disk; if [ ! "$disk" ]; then exit 1; fi - sudo dd if=/dev/zero bs=1M of=/dev/$disk count=1 2> /dev/null + dd if=/dev/zero bs=1M of=/dev/$disk count=1 2> /dev/null - sudo parted /dev/$disk mklabel msdos > /dev/null 2>&1; - sudo parted /dev/$disk mkpart primary 1 101M > /dev/null 2>&1; - sudo parted /dev/$disk set 1 boot on > /dev/null 2>&1; - sudo parted /dev/$disk mkpart primary 101M 3G > /dev/null 2>&1; + parted /dev/$disk mklabel msdos > /dev/null 2>&1; + parted /dev/$disk mkpart primary 1 101M > /dev/null 2>&1; + parted /dev/$disk set 1 boot on > /dev/null 2>&1; + parted /dev/$disk mkpart primary 101M 3G > /dev/null 2>&1; if $(echo $disk | egrep -qo "mmc|nvme"); then disk="${disk}p"; fi #formatting - sudo mkfs.vfat -F32 /dev/${disk}1 > /dev/null 2>&1; - sudo mkfs.ext4 /dev/${disk}2 > /dev/null 2>&1; + mkfs.vfat -F32 /dev/${disk}1 > /dev/null 2>&1; + mkfs.ext4 /dev/${disk}2 > /dev/null 2>&1; #Setting label for partition - sudo e2label /dev/${disk}2 "immudex" > /dev/null 2>&1; + e2label /dev/${disk}2 "immudex" > /dev/null 2>&1; #mount root partition - sudo mount /dev/${disk}2 /media > /dev/null 2>&1; + mount /dev/${disk}2 /media > /dev/null 2>&1; #creating directories for efi partition - sudo mkdir -p /media/boot/efi > /dev/null 2>&1; + mkdir -p /media/boot/efi > /dev/null 2>&1; #mount efi partition - sudo mount /dev/${disk}1 /media/boot/efi > /dev/null 2>&1; + mount /dev/${disk}1 /media/boot/efi > /dev/null 2>&1; #mount iso image in /mnt directory #sudo mount /dev/sr0 /mnt > /dev/null 2>&1; #copying whole iso image to the second partition - sudo cp -rvv /run/live/medium/* /media > /dev/null 2>&1; + cp -rvv /run/live/medium/* /media > /dev/null 2>&1; - sudo sed -i '/set\ timeout=/ s/30/5/' /media/boot/grub/grub.cfg; - sudo sed -i 's/bootfrom=removable //g' /media/boot/grub/grub.cfg; + sed -i '/set\ timeout=/ s/30/5/' /media/boot/grub/grub.cfg; + sed -i 's/bootfrom=removable //g' /media/boot/grub/grub.cfg; #removing unnecessary directories from second partition - sudo rm -rf /media/isolinux > /dev/null 2>&1; - sudo rm -rf /media/EFI > /dev/null 2>&1; + rm -rf /media/isolinux > /dev/null 2>&1; + rm -rf /media/EFI > /dev/null 2>&1; #GRUB Installation if [ -f /usr/lib/live/mount/medium/EFI/BOOT/BOOTIA32.EFI ]; then @@ -80,13 +80,13 @@ if $(sudo efibootmgr > /dev/null 2>&1); then else target="x86_64-efi"; fi - sudo grub-install --target=${target} --root-directory=/media --boot-directory=/media/boot --efi-directory=/media/boot/efi --bootloader-id=debian --removable > /dev/null 2>&1; + grub-install --target=${target} --root-directory=/media --boot-directory=/media/boot --efi-directory=/media/boot/efi --bootloader-id=debian --removable > /dev/null 2>&1; #Adding entry to EFI Firmware - sudo efibootmgr -c -d /dev/${originDisk} -p 1 -L "Debian" -l '\EFI\BOOT\grubx64.efi' > /dev/null 2>&1; + efibootmgr -c -d /dev/${originDisk} -p 1 -L "Debian" -l '\EFI\BOOT\grubx64.efi' > /dev/null 2>&1; #Umount all mounted filesystems - sudo umount -R /media > /dev/null 2>&1; + umount -R /media > /dev/null 2>&1; if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi @@ -98,37 +98,37 @@ else disk=$(selectDisk); if [ ! "$disk" ]; then exit 1; fi - sudo dd if=/dev/zero bs=1M of=/dev/$disk count=1 2> /dev/null + dd if=/dev/zero bs=1M of=/dev/$disk count=1 2> /dev/null - sudo parted /dev/$disk mklabel msdos > /dev/null 2>&1; - sudo parted /dev/$disk mkpart primary 1 3G > /dev/null 2>&1; - sudo parted /dev/$disk set 1 boot on > /dev/null 2>&1; + parted /dev/$disk mklabel msdos > /dev/null 2>&1; + parted /dev/$disk mkpart primary 1 3G > /dev/null 2>&1; + parted /dev/$disk set 1 boot on > /dev/null 2>&1; if $(echo $disk | egrep -qo "mmc|nvme"); then disk="${disk}p"; fi #formatting - sudo mkfs.ext4 /dev/${disk}1 > /dev/null 2>&1; + mkfs.ext4 /dev/${disk}1 > /dev/null 2>&1; #Setting label for partition is necessary for extlinux bootloader - sudo e2label /dev/${disk}1 "immudex" > /dev/null 2>&1; + e2label /dev/${disk}1 "immudex" > /dev/null 2>&1; #mount partition in /media directory - sudo mount /dev/${disk}1 /media > /dev/null 2>&1; + mount /dev/${disk}1 /media > /dev/null 2>&1; #Creating directory for extlinux - sudo mkdir /media/extlinux > /dev/null 2>&1; + mkdir /media/extlinux > /dev/null 2>&1; #Instalation extlinux files in abovementioned directory - sudo extlinux --install /media/extlinux > /dev/null 2>&1; + extlinux --install /media/extlinux > /dev/null 2>&1; #mount iso image in /mnt directory #sudo mount /dev/sr0 /mnt > /dev/null 2>&1; #copying live directory from iso image to partition - sudo cp -rvv /run/live/medium/live /media > /dev/null; 2>&1; + cp -rvv /run/live/medium/live /media > /dev/null; 2>&1; #installation extlinux MBR on first sector of hard drive (whole device) - sudo dd if=/usr/lib/EXTLINUX/mbr.bin of=/dev/${disk} > /dev/null 2>&1; + dd if=/usr/lib/EXTLINUX/mbr.bin of=/dev/${disk} > /dev/null 2>&1; #creating extlinux configuration file cat > extlinux.conf < /dev/null 2>&1; + cp extlinux.conf /media/extlinux > /dev/null 2>&1; rm extlinux.conf; #Unmounting filesystems - sudo umount /media > /dev/null 2>&1; + umount /media > /dev/null 2>&1; if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi fi diff --git a/tools/sbin/immudex-padlock b/tools/sbin/immudex-padlock index 1f4b5fc..3a7c506 100755 --- a/tools/sbin/immudex-padlock +++ b/tools/sbin/immudex-padlock @@ -39,20 +39,20 @@ function lock() { if [ "$mapperDeviceList" ]; then for dmDevice in $mapperDeviceList; do - if sudo cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then + if cryptsetup status /dev/mapper/${dmDevice} > /dev/null 2>&1; then mountPoint=$(df --output=source,target /dev/mapper/${dmDevice} | tail -n 1 | awk '{printf $2}'); if [ "$mountPoint" ]; then if $(sudo lsof $mountPoint > /dev/null 2>&1); then notify-send "Padlock" "The /dev/mapper/${dmDevice} cannot be unmount, because there are opened file or running proceses." --icon=dialog-error; else - sudo umount $mountPoint; + umount $mountPoint; if [ $? -ne 0 ]; then notify-send "Padlock" "The /dev/mapper/${dmDevice} cannot be unmount, because there are other filesystem is mounted in." --icon=dialog-error; fi - sudo cryptsetup close /dev/mapper/${dmDevice}; + cryptsetup close /dev/mapper/${dmDevice}; fi else - sudo cryptsetup close /dev/mapper/${dmDevice}; + cryptsetup close /dev/mapper/${dmDevice}; fi fi done diff --git a/tools/sbin/immudex-upgrade b/tools/sbin/immudex-upgrade index 6deb3f5..9d59bde 100755 --- a/tools/sbin/immudex-upgrade +++ b/tools/sbin/immudex-upgrade @@ -28,15 +28,15 @@ if [ "$1" ]; then check_distro_commit --print; fi elif [ "$1" ] && [ "$1" = "--upgrade" ]; then - part=$(sudo blkid | grep 'LABEL="immudex"' | awk '{printf $1}' | cut -d ":" -f 1); - if sudo mount | grep -q "$part"; then + part=$(blkid | grep 'LABEL="immudex"' | awk '{printf $1}' | cut -d ":" -f 1); + if mount | grep -q "$part"; then echo -n "Mounting iso image..."; - sudo mount $2 /mnt > /dev/null 2>&1; + mount $2 /mnt > /dev/null 2>&1; if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi - mountPointList=$(sudo mount | grep "$part" | awk '{printf $3" "}'); + mountPointList=$(mount | grep "$part" | awk '{printf $3" "}'); for mountPoint in $mountPointList; do echo -n "Unlocking $mountPoint ..."; - sudo mount $part $mountPoint -o remount,rw > /dev/null 2>&1; + mount $part $mountPoint -o remount,rw > /dev/null 2>&1; if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; else @@ -44,13 +44,13 @@ if [ "$1" ]; then fi done echo "Copying immudex files to the disk..."; - sudo cp -vv /mnt/live/* ${mountPoint}/live; + cp -vv /mnt/live/* ${mountPoint}/live; else echo "Mounting immudex partition..."; - sudo mount $part /mnt >> /dev/null 2>&1; + mount $part /mnt >> /dev/null 2>&1; if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi echo "Copying immudex files to the disk..."; - sudo cp -vv /run/live/medium/live/* /mnt/live; + cp -vv /run/live/medium/live/* /mnt/live; fi if [ $? -eq 0 ]; then echo -e "Copying immudex files to the disk...[ ${GREEN}OK${ENDCOLOR} ]"; -- 2.39.5