-
由 Chen Yu 提交于
Commit 283e7ad0 ("init: stricter checking of major:minor root= values") was so strict that it exposed the fact that a previously unknown device format was being used. Distributions like Ubuntu uses klibc (rather than uswsusp) to resume system from hibernation. klibc expressed the swap partition/file in the form of major:minor:offset. For example, 8:3:0 represents a swap partition in klibc, and klibc's resume process in initrd will finally echo 8:3:0 to /sys/power/resume for manually resuming. However, due to commit 283e7ad0's stricter checking, 8:3:0 will be treated as an invalid device format, and manual resuming from hibernation will fail. Fix this by adding support for devices with major:minor:offset format when resuming from hibernation. Reported-by: NPrigent, Christophe <christophe.prigent@intel.com> Signed-off-by: NChen Yu <yu.c.chen@intel.com> Acked-by: NRafael J. Wysocki <rjw@rjwysocki.net> Signed-off-by: NMike Snitzer <snitzer@redhat.com>
cb31ef48