Skip to content

Commit

Permalink
v 0.0.37
Browse files Browse the repository at this point in the history
  • Loading branch information
khvalera committed Jan 20, 2025
1 parent 84265cd commit 380950a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 8 deletions.
1 change: 1 addition & 0 deletions amdgpu
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ RAVEN
PICASSO
RAPHAEL
MENDOCINO
RADEON VEGA MOBILE SERIES
8 changes: 4 additions & 4 deletions install-partition.func
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ install_uboot(){
#=======================================
# Install operating system loader
install_bootloader(){
lsblk -e7 -d -p -o NAME,MODEL,SIZE,SERIAL | grep -v "rom\|loop\|airoot\|sr"
lsblk -e7 -d -p -o NAME,MODEL,SIZE,SERIAL,TYPE | grep -v "rom\|loop\|airoot\|sr"
if [ "$INSTALL_ARCH" == "arm" ] ; then
install_uboot;
if [ $? != 0 ]; then
Expand Down Expand Up @@ -324,7 +324,7 @@ mount_part() {
fi
FIND_DEV_LABEL=$(find_part_label "${LABEL_PART}")
OK=0
lsblk -p --output MODEL,NAME,LABEL,FSTYPE,TYPE,SIZE,UUID,SERIAL | grep -v "rom\|loop\|airoot\|sr"
lsblk -p -M --output MODEL,NAME,LABEL,FSTYPE,TYPE,SIZE,UUID,SERIAL | grep -v "rom\|loop\|airoot\|sr"
while [ "${OK}" = 0 ]; do
if [ -n "${FIND_DEV_LABEL}" ]; then
while [ "$YN" = "${YN#*$AMSURE_FIND_LABEL}" ] ; do
Expand Down Expand Up @@ -387,7 +387,7 @@ check_if_disk_exists(){

DEV=$1

STR=`lsblk -e7 -d -o NAME -p -P| grep $DEV > /dev/null`
STR=`lsblk -e7 -M -p -o NAME | grep -v "rom\|loop\|airoot\|sr\|part" | grep $DEV > /dev/null`
if [ $? = 0 ]; then
return 1
else
Expand All @@ -409,7 +409,7 @@ partition_drive() {
exit
fi
if [ "${AMSURE}" = "y" ] ; then
lsblk -e7 -d -p -o NAME,MODEL,SIZE,SERIAL | grep -v "rom\|loop\|airoot\|sr"
lsblk -e7 -M -p -o NAME,MODEL,SIZE,SERIAL,TYPE | grep -v "rom\|loop\|airoot\|sr"
OK=0
while [ "${OK}" = 0 ] ; do
STR_READ=`show_message SPECIFY_PARTITION`
Expand Down
11 changes: 8 additions & 3 deletions install-snuglinux.func
Original file line number Diff line number Diff line change
Expand Up @@ -466,13 +466,18 @@ generating_fstab(){

#=======================================
fix_mkinitcpio_conf(){
local hooks_file

hooks_file="hooks-udev.conf";
#hooks_file="hooks-systemd.conf";

if ! [ -d "$TMP_DIR/mkinitcpio" ]; then
mkdir "$TMP_DIR/mkinitcpio"
fi
wget --quiet --tries=3 -c $PROTOCOL_TYPE://${SNUG_SERVER}/install//mkinitcpio/hooks-systemd.conf -P $TMP_DIR/mkinitcpio -nc 2>/dev/null
sudo cp $TMP_DIR/mkinitcpio/hooks-systemd.conf $DIR_CHROOT/etc/mkinitcpio.conf.d/hooks-systemd.conf
wget --quiet --tries=3 -c $PROTOCOL_TYPE://${SNUG_SERVER}/install/mkinitcpio/$hooks_file -P $TMP_DIR/mkinitcpio -nc 2>/dev/null
cp $TMP_DIR/mkinitcpio/$hooks_file $DIR_CHROOT/etc/mkinitcpio.conf.d/$hooks_file
if ! [ $? = 0 ]; then
show_message FAILED_COPY_FILE "«hooks-systemd.conf»";
show_message FAILED_COPY_FILE "«$hooks_file»";
exit 1;
fi
#show_message MAKING_CHANGES_TO_FILE $DIR_CHROOT/etc/mkinitcpio.conf
Expand Down
2 changes: 1 addition & 1 deletion mkinitcpio/hooks-udev.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block filesystems fsck)
HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block encrypt lvm2 filesystems fsck)
1 change: 1 addition & 0 deletions nomodeset
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
82G33/G31
INTEL CORPORATION 2ND GENERATION
INTEL CORPORATION HD GRAPHICS 620

0 comments on commit 380950a

Please sign in to comment.